From sflaniga at redhat.com Mon Aug 19 03:04:46 2013 From: sflaniga at redhat.com (Sean Flanigan) Date: Mon, 19 Aug 2013 13:04:46 +1000 Subject: [zanata-devel] Release branch updated for Zanata server, client, api Message-ID: <52118B4E.6050605@redhat.com> Hi All, I have now updated the branches, which means that the branches now have the following pom versions: legacy (Server only): 2.3.x release: 3.0.x integration/master: 3.1.x This means it is now okay to merge new features to integration/master. If you have some existing bug-fix work which predates the branch update, it should still be possible to merge it into the release branch, but please make sure the pom version doesn't change. If you develop a new bug-fix, please consider whether it needs to be based on the release branch, so that we won't have to back-port it or rebase it. Just because it is based on release branch doesn't mean we have to merge it into 'release', but it gives us the option. Regards Sean. -- Sean Flanigan Senior Software Engineer Engineering - Internationalisation Red Hat -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 555 bytes Desc: OpenPGP digital signature URL: