From 73b7ec00e546b27d2bed22d30ad48a8735cfe6f0 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Mon, 28 Mar 2011 23:18:16 +0000 Subject: Merge branch 'trunk' into qpid-2920 Conflicts: qpid/cpp/src/cluster.mk qpid/java/systests/src/main/java/org/apache/qpid/test/client/destination/AddressBasedDestinationTest.java git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/qpid-2920@1086439 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/java/test-profiles/JavaInVMExcludes | 2 ++ 1 file changed, 2 insertions(+) (limited to 'qpid/java/test-profiles/JavaInVMExcludes') diff --git a/qpid/java/test-profiles/JavaInVMExcludes b/qpid/java/test-profiles/JavaInVMExcludes index 7e7da4302e..7960b28d81 100644 --- a/qpid/java/test-profiles/JavaInVMExcludes +++ b/qpid/java/test-profiles/JavaInVMExcludes @@ -41,3 +41,5 @@ org.apache.qpid.test.unit.ack.RecoverTest#testOderingWithSyncConsumer //The VM broker does not export the logging management JMX MBean org.apache.qpid.server.security.acl.ExternalAdminACLTest#* + +org.apache.qpid.test.unit.message.JMSPropertiesTest#testGetPropertyNames -- cgit v1.2.1