Author: clebert.suconic(a)jboss.com Date: 2010-09-10 13:49:00 -0400 (Fri, 10 Sep 2010) New Revision: 9669 Modified: branches/Branch_2_1/merge-activity.txt Log: update on merge-activity.txt Modified: branches/Branch_2_1/merge-activity.txt =================================================================== --- branches/Branch_2_1/merge-activity.txt 2010-09-10 17:44:13 UTC (rev 9668) +++ branches/Branch_2_1/merge-activity.txt 2010-09-10 17:49:00 UTC (rev 9669) @@ -11,3 +11,8 @@ - 30-aug-2010 - clebert - merge from trunk -r9590:9598 - 31-aug-2010 - jmesnil - merge from trunk -r9615:9616 + +- 10-sep-2010 - clebert - merge from this branch to trunk, r9591-9608, r9612-9659, r9660-9662 + trunk is aligned with all the changes from Branch_2_1 up to r9668 + +TODO: Bring changes from HORNETQ-469 as soon as it's stable (remove this line as soon as it's done)