You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2014/02/01 01:35:08 UTC
svn commit: r1563358 - in /qpid/branches/0.26: ./ qpid/ qpid/bin/
qpid/cpp/bindings/ qpid/cpp/bindings/qpid/examples/python/
qpid/cpp/docs/api/ qpid/cpp/src/ qpid/cpp/src/qpid/acl/
qpid/cpp/src/qpid/broker/ qpid/cpp/src/qpid/management/ qpid/cpp/src/qp...
Author: kwall
Date: Sat Feb 1 00:35:06 2014
New Revision: 1563358
URL: http://svn.apache.org/r1563358
Log:
QPID-5211: Broker logs spurious "No valid transition..." - merge second change from trunk.
svn merge -c 1562452 https://svn.apache.org/repos/asf/qpid/trunk
Modified:
qpid/branches/0.26/ (props changed)
qpid/branches/0.26/qpid/ (props changed)
qpid/branches/0.26/qpid/bin/ (props changed)
qpid/branches/0.26/qpid/cpp/bindings/ (props changed)
qpid/branches/0.26/qpid/cpp/bindings/qpid/examples/python/spout (props changed)
qpid/branches/0.26/qpid/cpp/docs/api/ (props changed)
qpid/branches/0.26/qpid/cpp/src/ (props changed)
qpid/branches/0.26/qpid/cpp/src/CMakeLists.txt (props changed)
qpid/branches/0.26/qpid/cpp/src/qpid/acl/ (props changed)
qpid/branches/0.26/qpid/cpp/src/qpid/broker/ (props changed)
qpid/branches/0.26/qpid/cpp/src/qpid/management/ManagementAgent.cpp (props changed)
qpid/branches/0.26/qpid/cpp/src/qpid/management/ManagementAgent.h (props changed)
qpid/branches/0.26/qpid/cpp/src/qpid/messaging/amqp/ (props changed)
qpid/branches/0.26/qpid/cpp/src/tests/ (props changed)
qpid/branches/0.26/qpid/java/ (props changed)
qpid/branches/0.26/qpid/java/amqp-1-0-client/ (props changed)
qpid/branches/0.26/qpid/java/amqp-1-0-client-jms/ (props changed)
qpid/branches/0.26/qpid/java/amqp-1-0-common/ (props changed)
qpid/branches/0.26/qpid/java/broker-core/ (props changed)
qpid/branches/0.26/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/ (props changed)
qpid/branches/0.26/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCMessageStore.java (props changed)
qpid/branches/0.26/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/AbstractMemoryMessageStore.java
qpid/branches/0.26/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/ (props changed)
qpid/branches/0.26/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ (props changed)
qpid/branches/0.26/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageMetaData_1_0.java (props changed)
qpid/branches/0.26/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ProtocolEngine_1_0_0_SASL.java (props changed)
qpid/branches/0.26/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/virtualhost/store/pool/ (props changed)
qpid/branches/0.26/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/LoggingManagement.java (props changed)
qpid/branches/0.26/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedBroker.java (props changed)
qpid/branches/0.26/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java (props changed)
qpid/branches/0.26/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedExchange.java (props changed)
qpid/branches/0.26/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java (props changed)
qpid/branches/0.26/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java (props changed)
qpid/branches/0.26/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanAttribute.java (props changed)
qpid/branches/0.26/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanConstructor.java (props changed)
qpid/branches/0.26/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanDescription.java (props changed)
qpid/branches/0.26/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperation.java (props changed)
qpid/branches/0.26/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperationParameter.java (props changed)
qpid/branches/0.26/qpid/java/systests/src/main/java/org/apache/qpid/server/SupportedProtocolVersionsTest.java (props changed)
qpid/branches/0.26/qpid/java/systests/src/main/java/org/apache/qpid/server/store/QuotaMessageStore.java
qpid/branches/0.26/qpid/java/systests/src/main/java/org/apache/qpid/test/client/timeouts/SyncWaitDelayTest.java
qpid/branches/0.26/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java (props changed)
qpid/branches/0.26/qpid/java/test-profiles/ (props changed)
qpid/branches/0.26/qpid/java/test-profiles/CPPExcludes (props changed)
qpid/branches/0.26/qpid/java/test-profiles/Excludes (props changed)
qpid/branches/0.26/qpid/java/test-profiles/JavaBDBExcludes (props changed)
qpid/branches/0.26/qpid/java/test-profiles/JavaExcludes (props changed)
qpid/branches/0.26/qpid/java/test-profiles/JavaPre010Excludes (props changed)
qpid/branches/0.26/qpid/java/test-profiles/JavaTransientExcludes (props changed)
qpid/branches/0.26/qpid/java/test-profiles/XAExcludes (props changed)
qpid/branches/0.26/qpid/java/test-profiles/cpp.async.testprofile (props changed)
qpid/branches/0.26/qpid/java/test-profiles/cpp.cluster.testprofile (props changed)
qpid/branches/0.26/qpid/java/test-profiles/cpp.noprefetch.testprofile (props changed)
qpid/branches/0.26/qpid/java/test-profiles/cpp.ssl.excludes (props changed)
qpid/branches/0.26/qpid/java/test-profiles/cpp.ssl.testprofile (props changed)
qpid/branches/0.26/qpid/java/test-profiles/cpp.testprofile (props changed)
qpid/branches/0.26/qpid/java/test-profiles/java-bdb-spawn.0-9-1.testprofile (props changed)
qpid/branches/0.26/qpid/java/test-profiles/java-bdb.0-9-1.testprofile (props changed)
qpid/branches/0.26/qpid/java/test-profiles/java-dby-spawn.0-9-1.testprofile (props changed)
qpid/branches/0.26/qpid/java/test-profiles/java-dby.0-9-1.testprofile (props changed)
qpid/branches/0.26/qpid/java/test-profiles/java-mms-spawn.0-10.testprofile (props changed)
qpid/branches/0.26/qpid/java/test-profiles/java-mms-spawn.0-9-1.testprofile (props changed)
qpid/branches/0.26/qpid/java/test-profiles/java-mms.0-9-1.testprofile (props changed)
qpid/branches/0.26/qpid/java/test-profiles/log4j-test.xml (props changed)
qpid/branches/0.26/qpid/java/test-profiles/test-provider.properties (props changed)
qpid/branches/0.26/qpid/java/test-profiles/test_resources/ (props changed)
qpid/branches/0.26/qpid/java/test-profiles/testprofile.defaults (props changed)
qpid/branches/0.26/qpid/packaging/windows/ (props changed)
qpid/branches/0.26/qpid/packaging/windows/installer.proj (props changed)
qpid/branches/0.26/qpid/python/ (props changed)
qpid/branches/0.26/qpid/python/qpid/concurrency.py (props changed)
qpid/branches/0.26/qpid/tests/src/py/qpid_tests/broker_0_9/queue.py (props changed)
Propchange: qpid/branches/0.26/
------------------------------------------------------------------------------
Merged /qpid/trunk:r1562452
Propchange: qpid/branches/0.26/qpid/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid:r1562452
Propchange: qpid/branches/0.26/qpid/bin/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/bin:r1562452
Propchange: qpid/branches/0.26/qpid/cpp/bindings/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/cpp/bindings:r1562452
Propchange: qpid/branches/0.26/qpid/cpp/bindings/qpid/examples/python/spout
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/cpp/bindings/qpid/examples/python/spout:r1562452
Propchange: qpid/branches/0.26/qpid/cpp/docs/api/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/cpp/docs/api:r1562452
Propchange: qpid/branches/0.26/qpid/cpp/src/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/cpp/src:r1562452
Propchange: qpid/branches/0.26/qpid/cpp/src/CMakeLists.txt
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/cpp/src/CMakeLists.txt:r1562452
Propchange: qpid/branches/0.26/qpid/cpp/src/qpid/acl/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/cpp/src/qpid/acl:r1562452
Propchange: qpid/branches/0.26/qpid/cpp/src/qpid/broker/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/cpp/src/qpid/broker:r1562452
Propchange: qpid/branches/0.26/qpid/cpp/src/qpid/management/ManagementAgent.cpp
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/cpp/src/qpid/management/ManagementAgent.cpp:r1562452
Propchange: qpid/branches/0.26/qpid/cpp/src/qpid/management/ManagementAgent.h
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/cpp/src/qpid/management/ManagementAgent.h:r1562452
Propchange: qpid/branches/0.26/qpid/cpp/src/qpid/messaging/amqp/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/cpp/src/qpid/messaging/amqp:r1562452
Propchange: qpid/branches/0.26/qpid/cpp/src/tests/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/cpp/src/tests:r1562452
Propchange: qpid/branches/0.26/qpid/java/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java:r1562452
Propchange: qpid/branches/0.26/qpid/java/amqp-1-0-client/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/amqp-1-0-client:r1562452
Propchange: qpid/branches/0.26/qpid/java/amqp-1-0-client-jms/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/amqp-1-0-client-jms:r1562452
Propchange: qpid/branches/0.26/qpid/java/amqp-1-0-common/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/amqp-1-0-common:r1562452
Propchange: qpid/branches/0.26/qpid/java/broker-core/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/broker-core:r1562452
Propchange: qpid/branches/0.26/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue:r1562452
Propchange: qpid/branches/0.26/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCMessageStore.java
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCMessageStore.java:r1562452
Modified: qpid/branches/0.26/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/AbstractMemoryMessageStore.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.26/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/AbstractMemoryMessageStore.java?rev=1563358&r1=1563357&r2=1563358&view=diff
==============================================================================
--- qpid/branches/0.26/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/AbstractMemoryMessageStore.java (original)
+++ qpid/branches/0.26/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/AbstractMemoryMessageStore.java Sat Feb 1 00:35:06 2014
@@ -133,9 +133,11 @@ abstract public class AbstractMemoryMess
@Override
public void close() throws Exception
{
- _stateManager.attainState(State.CLOSING);
- _closed.getAndSet(true);
- _stateManager.attainState(State.CLOSED);
+ if (_closed.compareAndSet(false, true))
+ {
+ _stateManager.attainState(State.CLOSING);
+ _stateManager.attainState(State.CLOSED);
+ }
}
@Override
Propchange: qpid/branches/0.26/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost:r1562452
Propchange: qpid/branches/0.26/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0:r1562452
Propchange: qpid/branches/0.26/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageMetaData_1_0.java
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageMetaData_1_0.java:r1562452
Propchange: qpid/branches/0.26/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ProtocolEngine_1_0_0_SASL.java
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ProtocolEngine_1_0_0_SASL.java:r1562452
Propchange: qpid/branches/0.26/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/virtualhost/store/pool/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/virtualhost/store/pool:r1562452
Propchange: qpid/branches/0.26/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/LoggingManagement.java
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/LoggingManagement.java:r1562452
Propchange: qpid/branches/0.26/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedBroker.java
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedBroker.java:r1562452
Propchange: qpid/branches/0.26/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java:r1562452
Propchange: qpid/branches/0.26/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedExchange.java
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedExchange.java:r1562452
Propchange: qpid/branches/0.26/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java:r1562452
Propchange: qpid/branches/0.26/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java:r1562452
Propchange: qpid/branches/0.26/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanAttribute.java
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanAttribute.java:r1562452
Propchange: qpid/branches/0.26/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanConstructor.java
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanConstructor.java:r1562452
Propchange: qpid/branches/0.26/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanDescription.java
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanDescription.java:r1562452
Propchange: qpid/branches/0.26/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperation.java
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperation.java:r1562452
Propchange: qpid/branches/0.26/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperationParameter.java
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperationParameter.java:r1562452
Propchange: qpid/branches/0.26/qpid/java/systests/src/main/java/org/apache/qpid/server/SupportedProtocolVersionsTest.java
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/SupportedProtocolVersionsTest.java:r1562452
Modified: qpid/branches/0.26/qpid/java/systests/src/main/java/org/apache/qpid/server/store/QuotaMessageStore.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.26/qpid/java/systests/src/main/java/org/apache/qpid/server/store/QuotaMessageStore.java?rev=1563358&r1=1563357&r2=1563358&view=diff
==============================================================================
--- qpid/branches/0.26/qpid/java/systests/src/main/java/org/apache/qpid/server/store/QuotaMessageStore.java (original)
+++ qpid/branches/0.26/qpid/java/systests/src/main/java/org/apache/qpid/server/store/QuotaMessageStore.java Sat Feb 1 00:35:06 2014
@@ -154,9 +154,11 @@ public class
@Override
public void close() throws Exception
{
- _stateManager.attainState(State.CLOSING);
- _closed.getAndSet(true);
- _stateManager.attainState(State.CLOSED);
+ if (_closed.compareAndSet(false, true))
+ {
+ _stateManager.attainState(State.CLOSING);
+ _stateManager.attainState(State.CLOSED);
+ }
}
@Override
Modified: qpid/branches/0.26/qpid/java/systests/src/main/java/org/apache/qpid/test/client/timeouts/SyncWaitDelayTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.26/qpid/java/systests/src/main/java/org/apache/qpid/test/client/timeouts/SyncWaitDelayTest.java?rev=1563358&r1=1563357&r2=1563358&view=diff
==============================================================================
--- qpid/branches/0.26/qpid/java/systests/src/main/java/org/apache/qpid/test/client/timeouts/SyncWaitDelayTest.java (original)
+++ qpid/branches/0.26/qpid/java/systests/src/main/java/org/apache/qpid/test/client/timeouts/SyncWaitDelayTest.java Sat Feb 1 00:35:06 2014
@@ -57,7 +57,7 @@ public class SyncWaitDelayTest extends Q
final String prefix = "virtualhosts.virtualhost." + VIRTUALHOST;
setVirtualHostConfigurationProperty(prefix + ".type", StandardVirtualHostFactory.TYPE);
- setVirtualHostConfigurationProperty(prefix + ".store.class", "org.apache.qpid.server.store.SlowMessageStore");
+ setVirtualHostConfigurationProperty(prefix + ".store.class", org.apache.qpid.server.store.SlowMessageStore.class.getName());
setVirtualHostConfigurationProperty(prefix + ".store.delays.commitTran.post", String.valueOf(POST_COMMIT_DELAY));
super.setUp();
Propchange: qpid/branches/0.26/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java:r1562452
Propchange: qpid/branches/0.26/qpid/java/test-profiles/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles:r1562452
Propchange: qpid/branches/0.26/qpid/java/test-profiles/CPPExcludes
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/CPPExcludes:r1562452
Propchange: qpid/branches/0.26/qpid/java/test-profiles/Excludes
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/Excludes:r1562452
Propchange: qpid/branches/0.26/qpid/java/test-profiles/JavaBDBExcludes
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/JavaBDBExcludes:r1562452
Propchange: qpid/branches/0.26/qpid/java/test-profiles/JavaExcludes
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/JavaExcludes:r1562452
Propchange: qpid/branches/0.26/qpid/java/test-profiles/JavaPre010Excludes
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/JavaPre010Excludes:r1562452
Propchange: qpid/branches/0.26/qpid/java/test-profiles/JavaTransientExcludes
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/JavaTransientExcludes:r1562452
Propchange: qpid/branches/0.26/qpid/java/test-profiles/XAExcludes
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/XAExcludes:r1562452
Propchange: qpid/branches/0.26/qpid/java/test-profiles/cpp.async.testprofile
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/cpp.async.testprofile:r1562452
Propchange: qpid/branches/0.26/qpid/java/test-profiles/cpp.cluster.testprofile
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/cpp.cluster.testprofile:r1562452
Propchange: qpid/branches/0.26/qpid/java/test-profiles/cpp.noprefetch.testprofile
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/cpp.noprefetch.testprofile:r1562452
Propchange: qpid/branches/0.26/qpid/java/test-profiles/cpp.ssl.excludes
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/cpp.ssl.excludes:r1562452
Propchange: qpid/branches/0.26/qpid/java/test-profiles/cpp.ssl.testprofile
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/cpp.ssl.testprofile:r1562452
Propchange: qpid/branches/0.26/qpid/java/test-profiles/cpp.testprofile
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/cpp.testprofile:r1562452
Propchange: qpid/branches/0.26/qpid/java/test-profiles/java-bdb-spawn.0-9-1.testprofile
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/java-bdb-spawn.0-9-1.testprofile:r1562452
Propchange: qpid/branches/0.26/qpid/java/test-profiles/java-bdb.0-9-1.testprofile
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/java-bdb.0-9-1.testprofile:r1562452
Propchange: qpid/branches/0.26/qpid/java/test-profiles/java-dby-spawn.0-9-1.testprofile
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/java-dby-spawn.0-9-1.testprofile:r1562452
Propchange: qpid/branches/0.26/qpid/java/test-profiles/java-dby.0-9-1.testprofile
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/java-dby.0-9-1.testprofile:r1562452
Propchange: qpid/branches/0.26/qpid/java/test-profiles/java-mms-spawn.0-10.testprofile
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/java-mms-spawn.0-10.testprofile:r1562452
Propchange: qpid/branches/0.26/qpid/java/test-profiles/java-mms-spawn.0-9-1.testprofile
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/java-mms-spawn.0-9-1.testprofile:r1562452
Propchange: qpid/branches/0.26/qpid/java/test-profiles/java-mms.0-9-1.testprofile
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/java-mms.0-9-1.testprofile:r1562452
Propchange: qpid/branches/0.26/qpid/java/test-profiles/log4j-test.xml
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/log4j-test.xml:r1562452
Propchange: qpid/branches/0.26/qpid/java/test-profiles/test-provider.properties
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/test-provider.properties:r1562452
Propchange: qpid/branches/0.26/qpid/java/test-profiles/test_resources/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/test_resources:r1562452
Propchange: qpid/branches/0.26/qpid/java/test-profiles/testprofile.defaults
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/testprofile.defaults:r1562452
Propchange: qpid/branches/0.26/qpid/packaging/windows/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/packaging/windows:r1562452
Propchange: qpid/branches/0.26/qpid/packaging/windows/installer.proj
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/packaging/windows/installer.proj:r1562452
Propchange: qpid/branches/0.26/qpid/python/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/python:r1562452
Propchange: qpid/branches/0.26/qpid/python/qpid/concurrency.py
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/python/qpid/concurrency.py:r1562452
Propchange: qpid/branches/0.26/qpid/tests/src/py/qpid_tests/broker_0_9/queue.py
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/tests/src/py/qpid_tests/broker_0_9/queue.py:r1562452
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org