4.2 and all of those changes should hit master as well. 4.2 should == master at the moment.
--David On Thu, Oct 10, 2013 at 11:19 AM, Travis Graham <tgra...@tgraham.us> wrote: > Have the 4.2 branch changes been merged into master now? > > Which branch should we be submitting patches off of? > > Travis > > On Oct 10, 2013, at 11:10 AM, Ian Duffy <i...@ianduffy.ie> wrote: > >>> Actually I think the jobs are broken now. I'm not too clear on the >>> publican changes. Can someone take a look and fix the publican >>> arguments? >> >> Current looking at this. >> midonet, niciranvp and release notes are back building. >> >> Should be able to get the quick install guide back up too, I had to >> push a publican config for it. >> >> The "build-docs-install-master" appears to have syntax errors. Not >> sure how to resolve them. >> >> On 10 October 2013 13:47, Prasanna Santhanam <t...@apache.org> wrote: >>> On Thu, Oct 10, 2013 at 05:57:58PM +0530, Prasanna Santhanam wrote: >>>> On Wed, Oct 02, 2013 at 03:15:23PM -0400, David Nalley wrote: >>>>> Per our earlier discussion, now that 4.2 has released, I moved the >>>>> docs for 4.2 to their own repo, and will be doing the same for master >>>>> in the next day or so as I clean things up. >>>>> >>>>> The new repo is: >>>>> >>>>> https://git-wip-us.apache.org/repos/asf/cloudstack-docs.git >>>>> >>>> >>>> Fixed all the build jobs on jenkins to point to the right repo. >>>> http://jenkins.buildacloud.org/view/master/ >>> >>> Actually I think the jobs are broken now. I'm not too clear on the >>> publican changes. Can someone take a look and fix the publican >>> arguments? >>> >>>> >>>>> The master branch is pretty desolate until I catch up, but 4.2 is >>>>> fully populated. >>>>> >>>>> --David >>>> >>>> -- >>>> Prasanna., >>>> >>>> ------------------------ >>>> Powered by BigRock.com >>> >>> -- >>> Prasanna., >>> >>> ------------------------ >>> Powered by BigRock.com >>> >
