I'm ready to deploy the configs with puppet. Should we continue to use CVS, upgrade to SVN or try to use something like hg (even though a distributed SCM would have more negatives than positives IMHO for our infrastructure. /me doesn't care, but does generally dislike cvs. -Mike