On Mon, Jan 9, 2012 at 1:05 PM, Andrew Petro <ape...@unicon.net> wrote: > Howdy, > > I see that CAS 3.4.11 [1] includes fixes not present in the 3.4.x > maintenance branch [2]. > > E.g., per CAS-1055 [3] LdapUtils was moved from cas-server-core to > cas-server-support-ldap and improved as regards its encoding of LDAP filter > values. This change is in 3.4.11 [4], but it isn't in 3.4.x [5]. > > > Should the 3.4.x maintenance branch be tracking 3.4.x releases and marching > towards 3.4.12? > > How does this work when using Git vs SVN? In SVN I'd have expected a 3.4.11 > tag to be produced by copy from (tag of) the 3.4.x branch.
I'd also like to check our mutual understanding of current branch management. Here's where I thought we landed last fall: * master - dev branch of the next release (currently marching towards 3.5) * 3.4.x - dev branch for a point or security release of the 3.4.x line once a new minor version is cut (e.g. 3.5) * 3.3.x - dev branch for a point or security release of the 3.3.x line 3.4.11 was tagged on master, and at that time 3.4.x should have been brought up to par with that tag, correct? Bill > > Andrew > > [1] https://github.com/Jasig/cas/tree/v3.4.11 > > [2] https://github.com/Jasig/cas/tree/3.4.x > > [3] https://issues.jasig.org/browse/CAS-1055 > > [4] > https://github.com/Jasig/cas/blob/v3.4.11/cas-server-support-ldap/src/main/java/org/jasig/cas/util/LdapUtils.java > > [5] > https://github.com/Jasig/cas/tree/3.4.x/cas-server-support-ldap/src/main/java/org/jasig/cas > > > > -- > You are currently subscribed to cas-dev@lists.jasig.org as: wgt...@gmail.com > To unsubscribe, change settings or access archives, see > http://www.ja-sig.org/wiki/display/JSG/cas-dev > -- You are currently subscribed to cas-dev@lists.jasig.org as: arch...@mail-archive.com To unsubscribe, change settings or access archives, see http://www.ja-sig.org/wiki/display/JSG/cas-dev
