Merge master to develop?

[Marcus Christie <ma...@apache.org>]

Dev,

I've made several improvements to the Ansible scripts on the master branch
of 'airavata' and I would like to merge those to the develop branch. I
think the plan was to merge these back to develop once we make the release
but I would also like to do a merge now.  Any objections?

Thanks,

Marcus

Re: Merge master to develop?

[Shameera Rathnayaka <sh...@gmail.com>]

Btw, I thought we agreed to merge bug fixes to both master and develop
branch same time.

On Sun, Apr 23, 2017 at 6:28 PM Shameera Rathnayaka <sh...@gmail.com>
wrote:

> Hi Marcus,
>
> We shouldn't deviate master from develop branch , +1 for merging master to
> dev.
>
> thanks,
> Shameera
>
> On Thu, Apr 20, 2017 at 9:28 AM Marcus Christie <ma...@apache.org>
> wrote:
>
>> Dev,
>>
>> I've made several improvements to the Ansible scripts on the master
>> branch of 'airavata' and I would like to merge those to the develop branch.
>> I think the plan was to merge these back to develop once we make the
>> release but I would also like to do a merge now.  Any objections?
>>
>> Thanks,
>>
>> Marcus
>>
> --
> Shameera Rathnayaka
>
-- 
Shameera Rathnayaka

Re: Merge master to develop?

[Shameera Rathnayaka <sh...@gmail.com>]

Hi Marcus,

We shouldn't deviate master from develop branch , +1 for merging master to
dev.

thanks,
Shameera

On Thu, Apr 20, 2017 at 9:28 AM Marcus Christie <ma...@apache.org>
wrote:

> Dev,
>
> I've made several improvements to the Ansible scripts on the master branch
> of 'airavata' and I would like to merge those to the develop branch. I
> think the plan was to merge these back to develop once we make the release
> but I would also like to do a merge now.  Any objections?
>
> Thanks,
>
> Marcus
>
-- 
Shameera Rathnayaka