Author: ritchiem
Date: Tue Apr 21 09:27:00 2009
New Revision: 767086
URL: http://svn.apache.org/viewvc?rev=767086&view=rev
Log:
QPID-1818 : Disable NoLocalAfterRecoveryTest until we can resolve the failover
problems
merged from trunk r767083
Modified:
qpid/branches/0.5-release/ (props changed)
qpid/branches/0.5-release/qpid/cpp/src/qpid/cluster/UpdateClient.cpp
(props changed)
qpid/branches/0.5-release/qpid/cpp/src/qpid/cluster/UpdateClient.h (props
changed)
qpid/branches/0.5-release/qpid/dotnet/build-msbuild.bat (props changed)
qpid/branches/0.5-release/qpid/dotnet/build-nant-release (props changed)
qpid/branches/0.5-release/qpid/dotnet/build-nant.bat (props changed)
qpid/branches/0.5-release/qpid/java/ (props changed)
qpid/branches/0.5-release/qpid/java/08ExcludeList-nonvm
qpid/branches/0.5-release/qpid/java/broker/ (props changed)
qpid/branches/0.5-release/qpid/java/broker/bin/ (props changed)
qpid/branches/0.5-release/qpid/java/broker/src/main/java/org/apache/qpid/server/management/
(props changed)
qpid/branches/0.5-release/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/
(props changed)
qpid/branches/0.5-release/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/AttributesTabControl.java
(props changed)
qpid/branches/0.5-release/qpid/ruby/ext/sasl/extconf.rb (props changed)
Propchange: qpid/branches/0.5-release/
------------------------------------------------------------------------------
svn:mergeinfo = /qpid/trunk:767083
Propchange: qpid/branches/0.5-release/qpid/cpp/src/qpid/cluster/UpdateClient.cpp
('svn:mergeinfo' removed)
Propchange: qpid/branches/0.5-release/qpid/cpp/src/qpid/cluster/UpdateClient.h
('svn:mergeinfo' removed)
Propchange: qpid/branches/0.5-release/qpid/dotnet/build-msbuild.bat
('svn:mergeinfo' removed)
Propchange: qpid/branches/0.5-release/qpid/dotnet/build-nant-release
('svn:mergeinfo' removed)
Propchange: qpid/branches/0.5-release/qpid/dotnet/build-nant.bat
('svn:mergeinfo' removed)
Propchange: qpid/branches/0.5-release/qpid/java/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 21 09:27:00 2009
@@ -1 +1 @@
-/qpid/trunk/qpid/java:764790,764838,765132,765134,765602,765604-765605,765608,765628,765656,766004,766025
+/qpid/trunk/qpid/java:764790,764838,765132,765134,765602,765604-765605,765608,765628,765656,766004,766025,767083
Modified: qpid/branches/0.5-release/qpid/java/08ExcludeList-nonvm
URL:
http://svn.apache.org/viewvc/qpid/branches/0.5-release/qpid/java/08ExcludeList-nonvm?rev=767086&r1=767085&r2=767086&view=diff
==============================================================================
--- qpid/branches/0.5-release/qpid/java/08ExcludeList-nonvm (original)
+++ qpid/branches/0.5-release/qpid/java/08ExcludeList-nonvm Tue Apr 21 09:27:00
2009
@@ -34,3 +34,5 @@
// This test may use QpidTestCase but it is not using the getConnection and is
hardwired to InVM
org.apache.qpid.test.unit.client.connection.CloseAfterConnectionFailureTest#*
+//QPID-1818 : Client code path does not correctly restore a transacted session
after failover.
+org.apache.qpid.server.persistent.NoLocalAfterRecoveryTest#*
Propchange: qpid/branches/0.5-release/qpid/java/broker/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 21 09:27:00 2009
@@ -1 +1 @@
-/qpid/trunk/qpid/java/broker:742626,743015,743028-743029,743304,743306,743311,743357,744113,747363,747367,747369-747370,747376,747783,747868-747870,747875,748561,748591,748641,748680,748686,749149,749282,749285,749315,749340,749572,753219-753220,753253,754934,754958,755256,757258,757270,758730,759097,760919,761721,762365,762992,763959,764109,764140,764790,766004,766025
+/qpid/trunk/qpid/java/broker:742626,743015,743028-743029,743304,743306,743311,743357,744113,747363,747367,747369-747370,747376,747783,747868-747870,747875,748561,748591,748641,748680,748686,749149,749282,749285,749315,749340,749572,753219-753220,753253,754934,754958,755256,757258,757270,758730,759097,760919,761721,762365,762992,763959,764109,764140,764790,766004,766025,767083
Propchange: qpid/branches/0.5-release/qpid/java/broker/bin/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 21 09:27:00 2009
@@ -1,2 +1,2 @@
/qpid/branches/0.5-release/qpid/java/broker/bin:757268
-/qpid/trunk/qpid/java/broker/bin:753219-753220,753253,758730,759097,760919,761721,762365,762992,763959,764109,764140,764790,766004,766025
+/qpid/trunk/qpid/java/broker/bin:753219-753220,753253,758730,759097,760919,761721,762365,762992,763959,764109,764140,764790,766004,766025,767083
Propchange:
qpid/branches/0.5-release/qpid/java/broker/src/main/java/org/apache/qpid/server/management/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 21 09:27:00 2009
@@ -1,2 +1,2 @@
/qpid/branches/0.5-release/qpid/java/broker/src/main/java/org/apache/qpid/server/management:757268
-/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/management:753219-753220,753253,758730,759097,760919,761721,762365,762992,763959,764109,764140,764790,766004,766025
+/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/management:753219-753220,753253,758730,759097,760919,761721,762365,762992,763959,764109,764140,764790,766004,766025,767083
Propchange:
qpid/branches/0.5-release/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 21 09:27:00 2009
@@ -1,2 +1,2 @@
/qpid/branches/0.5-release/qpid/java/broker/src/main/java/org/apache/qpid/server/queue:757257
-/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue:753219-753220,753253,757270,758730,759097,760919,761721,762365,762992,763959,764109,764140,764790,766004,766025
+/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue:753219-753220,753253,757270,758730,759097,760919,761721,762365,762992,763959,764109,764140,764790,766004,766025,767083
Propchange:
qpid/branches/0.5-release/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/AttributesTabControl.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 21 09:27:00 2009
@@ -1 +1 @@
-/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/AttributesTabControl.java:762365,764790,764838,765132,765134,765602,765604-765605,765608,765628,765656,766004,766025
+/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/AttributesTabControl.java:762365,764790,764838,765132,765134,765602,765604-765605,765608,765628,765656,766004,766025,767083
Propchange: qpid/branches/0.5-release/qpid/ruby/ext/sasl/extconf.rb
('svn:mergeinfo' removed)
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:[email protected]
