On Thu, Dec 10, 2015 at 10:57 AM, Akila Ravihansa Perera <raviha...@wso2.com
> wrote:

> Hi Isuru,
>
> The problem is master branch will have not only bug fixes but also new
> features and backward incompatible API changes which should not go to a
> patch release.
>

When we develop new feature and fix the bug, we can push them into the
master branch. If that new feature or bug fix related to the patch release,
we can only cherry pick those changes to the 4.1.x branch.

>
> Thanks.
>
>
> On Thursday, 10 December 2015, Isuru Haththotuwa <isu...@apache.org>
> wrote:
>
>> +1, will cherry pick the commits to master.
>>
>> On Thu, Dec 10, 2015 at 9:37 AM, Akila Ravihansa Perera <
>> raviha...@wso2.com> wrote:
>>
>>>
>>>
>>> On Wed, Dec 9, 2015 at 10:58 PM, Rajkumar Rajaratnam <rajkum...@wso2.com
>>> > wrote:
>>>
>>>> Hi Isuru,
>>>>
>>>> We have rebased stratos-4.1.x branch into master branch. We should
>>>> continue the development in master branch from now onwards.
>>>>
>>> IMHO if everything is merged to master, we should do the next releases
>> from master branch itself.
>>
>>>
>>> +1
>>>
>>> We should continue our dev work on master branch and do the 4.1.x
>>> releases from stratos-4.1.x branch by cherry-picking bug fixes/critical
>>> improvements.
>>>
>>> I think it's best if noone commits to stratos-4.1.x branch except for
>>> the release manager.
>>>
>>>
>>>
>>>
>>>> Thanks,
>>>> Raj.
>>>>
>>>> On Wed, Dec 9, 2015 at 10:39 PM, Isuru Haththotuwa <isu...@apache.org>
>>>> wrote:
>>>>
>>>>>
>>>>>
>>>>> On Wed, Dec 9, 2015 at 10:38 PM, Isuru Haththotuwa <isu...@apache.org>
>>>>> wrote:
>>>>>
>>>>>> This is not committed to stratos-4.1.x branch.
>>>>>>
>>>>> Correction:  This is now committed to stratos-4.1.x branch.
>>>>>
>>>>>>
>>>>>> On Tue, Dec 1, 2015 at 7:34 PM, Isuru Haththotuwa <isu...@apache.org>
>>>>>> wrote:
>>>>>>
>>>>>>> Sent a PR [1] with the fix.
>>>>>>>
>>>>>>> [1]. https://github.com/apache/stratos/pull/498/
>>>>>>>
>>>>>>> On Sun, Nov 29, 2015 at 9:18 PM, Isuru Haththotuwa <
>>>>>>> isu...@apache.org> wrote:
>>>>>>>
>>>>>>>>
>>>>>>>>
>>>>>>>> On Fri, Nov 27, 2015 at 11:51 AM, Akila Ravihansa Perera <
>>>>>>>> raviha...@wso2.com> wrote:
>>>>>>>>
>>>>>>>>> Hi Isuru,
>>>>>>>>>
>>>>>>>>> Good thought. I'd suggest that we just rename the directory by
>>>>>>>>> appending "stratos.adc.bak" to existing one. When removing the signup,
>>>>>>>>> rename it back to the original name (remove the suffix). Let's keep 
>>>>>>>>> things
>>>>>>>>> simple as possible :)
>>>>>>>>>
>>>>>>>> +1, maybe using a different suffix :)
>>>>>>>>
>>>>>>>>>
>>>>>>>>> Thanks.
>>>>>>>>>
>>>>>>>>> On Fri, Nov 27, 2015 at 11:35 AM, Isuru Haththotuwa <
>>>>>>>>> isu...@apache.org> wrote:
>>>>>>>>>
>>>>>>>>>> Hi,
>>>>>>>>>>
>>>>>>>>>> On Fri, Nov 27, 2015 at 11:13 AM, Gayan Gunarathne <
>>>>>>>>>> gay...@wso2.com> wrote:
>>>>>>>>>>
>>>>>>>>>>> Hi,
>>>>>>>>>>>
>>>>>>>>>>> On Fri, Nov 27, 2015 at 6:34 AM, Isuru Haththotuwa <
>>>>>>>>>>> isu...@apache.org> wrote:
>>>>>>>>>>>
>>>>>>>>>>>> Hi Devs,
>>>>>>>>>>>>
>>>>>>>>>>>> Currently for a multiTenant Application (multiTenant=true),
>>>>>>>>>>>> when a signup is removed, all artifacts which are in the local 
>>>>>>>>>>>> repository
>>>>>>>>>>>> path will be deleted from the file system.
>>>>>>>>>>>>
>>>>>>>>>>> But there are some cases where the runtime of the cartridge
>>>>>>>>>>>> instance depends on some of the artifacts which were originally 
>>>>>>>>>>>> there, and
>>>>>>>>>>>> without those artifacts, the cartridge instance runtime would not 
>>>>>>>>>>>> function
>>>>>>>>>>>> properly. I suggest the following to handle this:
>>>>>>>>>>>>
>>>>>>>>>>>>
>>>>>>>>>>>>    1. Prior to the first clone, take a backup of the artifacts
>>>>>>>>>>>>    in the local repository path to a temporary location
>>>>>>>>>>>>    2. When the signup is removed, clean all the artifacts
>>>>>>>>>>>>    which had been cloned to the local repository path location 
>>>>>>>>>>>> (from the git
>>>>>>>>>>>>    repository which was provided when signing up), and restore the 
>>>>>>>>>>>> artifacts
>>>>>>>>>>>>    (copy them back from the backup location to local repository 
>>>>>>>>>>>> path)
>>>>>>>>>>>>
>>>>>>>>>>>> This will ensure the state of the instance after removal of the
>>>>>>>>>>>> signup is equivalent to the state before the signup was created. 
>>>>>>>>>>>> WDYT?
>>>>>>>>>>>>
>>>>>>>>>>>
>>>>>>>>>>> I assume this is happened for the super tenant sign ups
>>>>>>>>>>> only.Other tenants it works fine. Isn't? So we need to do consider 
>>>>>>>>>>> this if
>>>>>>>>>>> is only the super tenant sign up.
>>>>>>>>>>>
>>>>>>>>>> We can implement this generically for all single tenant and multi
>>>>>>>>>> tenant signup removal, without explicitly checking. IMHO that is the 
>>>>>>>>>> best
>>>>>>>>>> way.
>>>>>>>>>>
>>>>>>>>>>>
>>>>>>>>>>>
>>>>>>>>>>>> --
>>>>>>>>>>>> Thanks and Regards,
>>>>>>>>>>>>
>>>>>>>>>>>> Isuru H.
>>>>>>>>>>>> +94 716 358 048* <http://wso2.com/>*
>>>>>>>>>>>>
>>>>>>>>>>>>
>>>>>>>>>>>>
>>>>>>>>>>>
>>>>>>>>>>>
>>>>>>>>>>> --
>>>>>>>>>>>
>>>>>>>>>>> Gayan Gunarathne
>>>>>>>>>>> Technical Lead, WSO2 Inc. (http://wso2.com)
>>>>>>>>>>> Committer & PMC Member, Apache Stratos
>>>>>>>>>>> email : gay...@wso2.com  | mobile : +94 775030545
>>>>>>>>>>>
>>>>>>>>>>> --
>>>>>>>>>>> <%2B94%20766819985>
>>>>>>>>>>> <%2B94%20766819985>
>>>>>>>>>>> Thanks and Regards,
>>>>>>>>>>>
>>>>>>>>>>> Isuru H.
>>>>>>>>>>> <%2B94%20766819985>
>>>>>>>>>>> +94 716 358 048 <%2B94%20766819985>* <http://wso2.com/>*
>>>>>>>>>>>
>>>>>>>>>>>
>>>>>>>>>>> * <http://wso2.com/>*
>>>>>>>>>>>
>>>>>>>>>>>
>>>>>>>>>>>
>>>>>>>>>
>>>>>>>>>
>>>>>>>>> --
>>>>>>>>> Akila Ravihansa Perera
>>>>>>>>> WSO2 Inc.;  http://wso2.com/
>>>>>>>>>
>>>>>>>>> Blog: http://ravihansa3000.blogspot.com
>>>>>>>>>
>>>>>>>>> --
>>>>>>>>> <http://ravihansa3000.blogspot.com>
>>>>>>>>> <http://ravihansa3000.blogspot.com>
>>>>>>>>> Thanks and Regards,
>>>>>>>>>
>>>>>>>>> Isuru H.
>>>>>>>>> <http://ravihansa3000.blogspot.com>
>>>>>>>>> +94 716 358 048 <http://ravihansa3000.blogspot.com>*
>>>>>>>>> <http://wso2.com/>*
>>>>>>>>>
>>>>>>>>>
>>>>>>>>> * <http://wso2.com/>*
>>>>>>>>>
>>>>>>>>>
>>>>>>>>>
>>>>>>>
>>>>>>>
>>>>>>> --
>>>>>>> Thanks and Regards,
>>>>>>>
>>>>>>> Isuru H.
>>>>>>> +94 716 358 048* <http://wso2.com/>*
>>>>>>>
>>>>>>>
>>>>>>>
>>>>>>
>>>>>>
>>>>>> --
>>>>>> Thanks and Regards,
>>>>>>
>>>>>> Isuru H.
>>>>>> +94 716 358 048* <http://wso2.com/>*
>>>>>>
>>>>>>
>>>>>>
>>>>>
>>>>>
>>>>> --
>>>>> Thanks and Regards,
>>>>>
>>>>> Isuru H.
>>>>> +94 716 358 048* <http://wso2.com/>*
>>>>>
>>>>>
>>>>>
>>>>
>>>>
>>>> --
>>>> Rajkumar Rajaratnam
>>>> Committer & PMC Member, Apache Stratos
>>>> Software Engineer, WSO2
>>>>
>>>> Mobile : +94777568639
>>>> Blog : rajkumarr.com
>>>>
>>>
>>>
>>>
>>> --
>>> Akila Ravihansa Perera
>>> WSO2 Inc.;  http://wso2.com/
>>>
>>> Blog: http://ravihansa3000.blogspot.com
>>>
>>>
>>> --
>>> Akila Ravihansa Perera
>>> WSO2 Inc.;  http://wso2.com/
>>>
>>> Blog: http://ravihansa3000.blogspot.com
>>>
>>>
>>
>>
>> --
>> Thanks and Regards,
>>
>> Isuru H.
>> +94 716 358 048* <http://wso2.com/>*
>>
>>
>>
>
> --
> Akila Ravihansa Perera
> WSO2 Inc.;  http://wso2.com/
>
> Blog: http://ravihansa3000.blogspot.com
>
>


-- 

Gayan Gunarathne
Technical Lead, WSO2 Inc. (http://wso2.com)
Committer & PMC Member, Apache Stratos
email : gay...@wso2.com  | mobile : +94 775030545 <%2B94%20766819985>

Reply via email to