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, Lahiru Sandaruwan <lahi...@wso2.com> wrote: > Great stuff Raj! > > Will start to test other scenarios. > > Thanks. > > On Thu, Feb 26, 2015 at 12:32 AM, Rajkumar Rajaratnam <rajkum...@wso2.com> > 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. >> >> I have fixed all the conflicts and merging issues. >> >> Single cartridge application becomes active in this branch :) Scaling >> also works fine! >> >> Everyone please work on *master-deployment-policy-fix-merge *branch, try >> out all the samples and fix as you encounter issues. >> >> Thanks. >> >> On Wed, Feb 25, 2015 at 9:18 PM, Rajkumar Rajaratnam <rajkum...@wso2.com> >> wrote: >> >>> 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 to master branch. >>> >>> *Please hold your commits to master and 4.1.0-beta-deployment-policy-fix >>> branches, if your commits are not that important (fixing logs, alignments, >>> etc). If you are doing any important fixes, please commit to any branch you >>> want.* >>> >>> After fixing conflicts in the new branch, everyone should commit to this >>> new branch and fix all the functional issues. It is better not to commit to >>> master and 4.1.0-beta-deployment-policy-fix until this new branch becomes >>> stable. This is to avoid having merge conflicts again. >>> >>> Once this new branch becomes stable, we will merge this to master and >>> continue the development on master branch. You will be able to commit to >>> this new branch in couple of hours. >>> >>> Please let us know if you have any concerns. >>> >>> Thanks. >>> >>> -- >>> Rajkumar Rajaratnam >>> Committer & PMC Member, Apache Stratos >>> Software Engineer, WSO2 >>> >>> Mobile : +94777568639 >>> Blog : rajkumarr.com >>> >> >> >> >> -- >> Rajkumar Rajaratnam >> Committer & PMC Member, Apache Stratos >> Software Engineer, WSO2 >> >> Mobile : +94777568639 >> Blog : rajkumarr.com >> > > > > -- > -- > Lahiru Sandaruwan > Committer and PMC member, Apache Stratos, > Senior Software Engineer, > WSO2 Inc., http://wso2.com > lean.enterprise.middleware > > email: lahi...@wso2.com blog: http://lahiruwrites.blogspot.com/ > linked-in: http://lk.linkedin.com/pub/lahiru-sandaruwan/16/153/146 > > -- -- Lahiru Sandaruwan Committer and PMC member, Apache Stratos, Senior Software Engineer, WSO2 Inc., http://wso2.com lean.enterprise.middleware email: lahi...@wso2.com blog: http://lahiruwrites.blogspot.com/ linked-in: http://lk.linkedin.com/pub/lahiru-sandaruwan/16/153/146
