Author: gsim
Date: Fri Jun 15 09:16:41 2007
New Revision: 547727
URL: http://svn.apache.org/viewvc?view=rev&rev=547727
Log:
Blocked revisions 537171,540169 via svnmerge
........
r537171 | gsim | 2007-05-11 13:03:24 +0100 (Fri, 11 May 2007) | 3 lines
Fix for acknowledgements (since the addition of the protocol version, the
'wrong' constructor to BasicAckBody was being called resulting in random values
for delivery tag and multiple)
........
r540169 | gsim | 2007-05-21 16:23:55 +0100 (Mon, 21 May 2007) | 3 lines
Made message less scary when persistence not enabled(!).
........
Modified:
incubator/qpid/trunk/qpid/ (props changed)
Propchange: incubator/qpid/trunk/qpid/
------------------------------------------------------------------------------
--- svnmerge-blocked (original)
+++ svnmerge-blocked Fri Jun 15 09:16:41 2007
@@ -1 +1 @@
-/incubator/qpid/branches/M2:532787,532791
/incubator/qpid/branches/qpid.0-9:492777,496596
+/incubator/qpid/branches/M2:532787,532791,537171,540169
/incubator/qpid/branches/qpid.0-9:492777,496596
