Should be done in a few minutes. Just testing and sorting out a couple of tree conflicts that I think happened due to me merging trunk into the branch a while ago and then attempting to merge the original version of the branch into trunk....
Ethan On Thu, Jan 6, 2011 at 6:22 PM, Richard Hirsch <[email protected]> wrote: > Looks like the Lift 2.2 release is finished: > http://groups.google.com/group/liftweb/browse_thread/thread/240f60d91a1af2c4/d284eeca820e391a?show_docid=d284eeca820e391a > > @Ethan - would you be so kind as to migrate the 2.2 branch into the trunk. > > Thanks. > > D. > > > On Mon, Jan 3, 2011 at 6:47 PM, Richard Hirsch <[email protected]> wrote: >> I just looked at the lift mailing list. It looks like RC6 will be the >> final 2.2 release. Ethan - why don't you upgrade the pom.xml in the >> branch to RC6 and then we can run a few tests. When 2.2 final is >> officially released, then we'll merge the branch to the trunk and >> update to the 2.2 final (no RC) version. >> >> D. >> On Mon, Jan 3, 2011 at 5:46 PM, Ethan Jewett <[email protected]> wrote: >>> t >> >
