2009/12/20 Russ Allbery <r...@stanford.edu>: > The advantage of Git branches is that we can much more easily merge or > cherry-pick changes between the environments. For example, changes that > must be made in production can be made there and then merged into test, so > that test stays in sync easily but can maintain separate changes. > > Our intention is to then cut a new production branch from test every three > months and retain two production branches, cutting each production server > from the old branch over to the new branch on a quarterly cycle according > to the requirements of that production environment. That way, all servers > benefit from general architectural changes, but those changes are > thoroughly tested first in the test/dev environments (which will all point > to the master branch).
+1 to Russ' approach. By maintaining branches and creating a lifecycle you can also fit the cycle to your change control, embed it in your ticketing system, etc, etc. Teaches good development lifecycle skills to admins too. :) Regards James Turnbull -- Author of: * Pro Linux System Administration (http://tinyurl.com/linuxadmin) * Pulling Strings with Puppet (http://tinyurl.com/pupbook) * Pro Nagios 2.0 (http://tinyurl.com/pronagios) * Hardening Linux (http://tinyurl.com/hardeninglinux) -- You received this message because you are subscribed to the Google Groups "Puppet Users" group. To post to this group, send email to puppet-us...@googlegroups.com. To unsubscribe from this group, send email to puppet-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/puppet-users?hl=en.