Re: [Important] Merge master branch and 4.1.0-beta-deployment-policy-fix branch

2015-02-27 Thread Rajkumar Rajaratnam
I have rebased *master-deployment-policy-fix-merge *onto* master *branch. Now master branch has deployment changes. Please work on master branch hereafter. Thanks. On Fri, Feb 27, 2015 at 3:55 PM, Imesh Gunaratne wrote: > I have now created a new kubernetes tag in master branch. I think we can

Re: [Important] Merge master branch and 4.1.0-beta-deployment-policy-fix branch

2015-02-27 Thread Imesh Gunaratne
I have now created a new kubernetes tag in master branch. I think we can now merge *master-deployment-policy-fix-merge *branch to master with the new deployment policy changes. Thanks On Thu, Feb 26, 2015 at 3:38 PM, Imesh Gunaratne wrote: > Great work Raj!! :-) BTW I merged several pull reques

Re: [Important] Merge master branch and 4.1.0-beta-deployment-policy-fix branch

2015-02-26 Thread Imesh Gunaratne
Great work Raj!! :-) BTW I merged several pull requests to master branch, will apply them to *master-deployment-policy-fix-merge* to make it consistent. Thanks On Thu, Feb 26, 2015 at 1:08 PM, Lahiru Sandaruwan wrote: > Hi, > > I have cherry picked 3 missing commits to the new branch. Please re

Re: [Important] Merge master branch and 4.1.0-beta-deployment-policy-fix branch

2015-02-25 Thread Lahiru Sandaruwan
Hi, I have cherry picked 3 missing commits to the new branch. Please refrain from committing anything to master branch. Use *master-deployment-policy-fix-merge *as Raj mentioned above. We need to get thing stable in this branch before switch back. Thanks. On Thu, Feb 26, 2015 at 12:35 AM, Lahir

Re: [Important] Merge master branch and 4.1.0-beta-deployment-policy-fix branch

2015-02-25 Thread Lahiru Sandaruwan
Great stuff Raj! Will start to test other scenarios. Thanks. On Thu, Feb 26, 2015 at 12:32 AM, Rajkumar Rajaratnam wrote: > Hi Devs, > > I have created the new branch (*master-deployment-policy-fix-merge*) from > 4.1.0-beta-deployment-policy-fix and rebased master branch into this new > branch

Re: [Important] Merge master branch and 4.1.0-beta-deployment-policy-fix branch

2015-02-25 Thread Rajkumar Rajaratnam
Hi Devs, I have created the new branch (*master-deployment-policy-fix-merge*) from 4.1.0-beta-deployment-policy-fix and rebased master branch into this new branch. I have fixed all the conflicts and merging issues. Single cartridge application becomes active in this branch :) Scaling also works

[Important] Merge master branch and 4.1.0-beta-deployment-policy-fix branch

2015-02-25 Thread Rajkumar Rajaratnam
Hi Devs, I am going to $Subject. This is the way we are going to do. We will create a new branch (master-deployment-policy-fix-merge) from 4.1.0-beta-deployment-policy-fix and rebase master branch into this new branch. After fixing conflicts and merging issues, we will merge this new branch back