For the past couple of months we've had a puppet-4 branch running which allowed us to land any breaking changes that should go into puppet 4.0 without having to hold onto them. Now that puppet 3.7.0 has been released, that opens up the master branch for puppet 4.0 development! Rejoice!
Over the next few days we'll be working on any pull requests that are open against the puppet-4 branch, then doing the final merge of puppet-4 -> master, and then delete the puppet-4 branch (and associated Jenkins jobs).
From this point on puppet-4 changes should be sent to the master branch. This brings the development workflow back to our normal state of just the two branches:
* stable: the last feature release, where patches that will be released in a .z release land.
* master: the next release, where most changes should land.
--
Andrew Parker
Freenode: zaphod42
Twitter: @aparker42
Software Developer