Branch-0.5

[Bikas Saha <bi...@hortonworks.com>]

Folks,



Branch-0.5 is open for bug fixes (only) to the 0.5 release. Please don’t
forget to merge bug-fixes into this branch from master when they apply to
0.5 code.



Bikas

-- 
CONFIDENTIALITY NOTICE
NOTICE: This message is intended for the use of the individual or entity to 
which it is addressed and may contain information that is confidential, 
privileged and exempt from disclosure under applicable law. If the reader 
of this message is not the intended recipient, you are hereby notified that 
any printing, copying, dissemination, distribution, disclosure or 
forwarding of this communication is strictly prohibited. If you have 
received this communication in error, please contact the sender immediately 
and delete it from your system. Thank You.

Re: Branch-0.5

[Jonathan Eagles <je...@gmail.com>]

After reading this discussion I found that 'git cherry-pick -x' keeps the
original message and appends a cherry-pick message. It may be helpful in
remaining consistent. Though I've not experimented with it when hitting a
conflict.

TEZ-XXX. Original message

(cherry picked from commit ecc8192ffa2de8e217dbd18822e8b241b2390749)



On Mon, Aug 25, 2014 at 9:10 PM, Siddharth Seth <ss...@apache.org> wrote:

> While merging changes into 0.5, please retain the jira number - that makes
> it much easier to browse the logs. A git cherry-pick revision will work
> well in most cases.
>
> Another aspect which we have to address is CHANGES.txt. Since we have 0.5.1
> and 0.6 going in parallel, I think we need to start maintaing this list.
> Thoughts ?
>
>
> On Mon, Aug 25, 2014 at 2:44 PM, Bikas Saha <bi...@hortonworks.com> wrote:
>
> > Folks,
> >
> >
> >
> > Branch-0.5 is open for bug fixes (only) to the 0.5 release. Please don’t
> > forget to merge bug-fixes into this branch from master when they apply to
> > 0.5 code.
> >
> >
> >
> > Bikas
> >
> > --
> > CONFIDENTIALITY NOTICE
> > NOTICE: This message is intended for the use of the individual or entity
> to
> > which it is addressed and may contain information that is confidential,
> > privileged and exempt from disclosure under applicable law. If the reader
> > of this message is not the intended recipient, you are hereby notified
> that
> > any printing, copying, dissemination, distribution, disclosure or
> > forwarding of this communication is strictly prohibited. If you have
> > received this communication in error, please contact the sender
> immediately
> > and delete it from your system. Thank You.
> >
>

Re: Branch-0.5

[Siddharth Seth <ss...@apache.org>]

While merging changes into 0.5, please retain the jira number - that makes
it much easier to browse the logs. A git cherry-pick revision will work
well in most cases.

Another aspect which we have to address is CHANGES.txt. Since we have 0.5.1
and 0.6 going in parallel, I think we need to start maintaing this list.
Thoughts ?


On Mon, Aug 25, 2014 at 2:44 PM, Bikas Saha <bi...@hortonworks.com> wrote:

> Folks,
>
>
>
> Branch-0.5 is open for bug fixes (only) to the 0.5 release. Please don’t
> forget to merge bug-fixes into this branch from master when they apply to
> 0.5 code.
>
>
>
> Bikas
>
> --
> CONFIDENTIALITY NOTICE
> NOTICE: This message is intended for the use of the individual or entity to
> which it is addressed and may contain information that is confidential,
> privileged and exempt from disclosure under applicable law. If the reader
> of this message is not the intended recipient, you are hereby notified that
> any printing, copying, dissemination, distribution, disclosure or
> forwarding of this communication is strictly prohibited. If you have
> received this communication in error, please contact the sender immediately
> and delete it from your system. Thank You.
>