Skip to main content

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
[eclipselink-dev] Branch to release chart

Hi All,

I understand that there is a little bit of confusion pertaining to which branch maps to which release or patch set.  This email is intended to clear up some of that confusion.

branches/1.1
 - Patches on the 1.1 stream go here, the current next planned patch set on this stream is 1.1.4.

branches/1.2
 - Patches on the 1.2 stream go here, the current next planned patch set on this stream is 1.2.1.

branches/2.0
 - Patches on the 2.0 stream go here, the current next planned patch set on this stream is 2.0.1.

Trunk
 - Trunk will always refer to the next major release, which currently is 2.1.0.

Developers are responsible for merging the changes into all applicable streams.  Any bug or enhancement targeted at 2.1.0 needs to only go in trunk.  However a bug fix targeting 1.1.4 will need to be merged into all 4 of the above streams.  Most changes will be targeted at trunk, or one stream back, so merging into all 4 streams should be rather rare.  We are currently planning to make 1.1.4 the last 1.1 patch set, which will reduce this load somewhat.

Peter


Back to the top