Author: borges Date: 2011-07-25 11:07:19 -0400 (Mon, 25 Jul 2011) New Revision: 11042 Removed: branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/logging/ branches/HORNETQ-720_Replication/hornetq-rest/hornetq-rest/src/main/java/org/jboss/ branches/HORNETQ-720_Replication/hornetq-rest/hornetq-rest/src/test/java/org/jboss/resteasy/ branches/HORNETQ-720_Replication/tests/performance-tests/src/test/java/org/hornetq/tests/performance/persistence/ branches/HORNETQ-720_Replication/tests/timing-tests/src/test/java/org/hornetq/tests/timing/core/client/ branches/HORNETQ-720_Replication/tests/timing-tests/src/test/java/org/hornetq/tests/timing/core/remoting/ branches/HORNETQ-720_Replication/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/version/ Modified: branches/HORNETQ-720_Replication/ Log: merge from main Property changes on: branches/HORNETQ-720_Replication ___________________________________________________________________ Modified: svn:mergeinfo - /trunk:10878-10916 + /trunk:10878-11041