You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ru...@apache.org on 2007/09/24 17:31:37 UTC
svn commit: r578852 - /incubator/qpid/trunk/qpid/
Author: rupertlssmith
Date: Mon Sep 24 08:31:36 2007
New Revision: 578852
URL: http://svn.apache.org/viewvc?rev=578852&view=rev
Log:
Blocked revisions 575688,577316,577660,578048,578061,578765 via svnmerge
................
r575688 | rhs | 2007-09-14 15:04:38 +0100 (Fri, 14 Sep 2007) | 1 line
Merged revision 572751 from the trunk, this fixes QPID-573.
................
r577316 | rupertlssmith | 2007-09-19 15:40:41 +0100 (Wed, 19 Sep 2007) | 3 lines
Initialized merge tracking via "svnmerge" with revisions "400000-567005,568919,568924,573502,573516,574902,575738,575788,575811" from
https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1
................
r577660 | rupertlssmith | 2007-09-20 10:51:18 +0100 (Thu, 20 Sep 2007) | 9 lines
Recorded merge of revisions 574874 via svnmerge from
https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1
........
r574874 | gsim | 2007-09-12 10:59:56 +0100 (Wed, 12 Sep 2007) | 3 lines
Applied fix (submitted as patch to qpid-dev by Nuno Santos): include headers used in posix wrappers.
........
................
r578048 | rupertlssmith | 2007-09-21 11:12:59 +0100 (Fri, 21 Sep 2007) | 9 lines
Recorded merge of revisions 577941 via svnmerge from
https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1
........
r577941 | rgreig | 2007-09-20 22:52:44 +0100 (Thu, 20 Sep 2007) | 2 lines
Attempt to fix hanging builds due to client tests
........
................
r578061 | rupertlssmith | 2007-09-21 12:10:10 +0100 (Fri, 21 Sep 2007) | 10 lines
Merged revisions 578058 via svnmerge from
https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1
........
r578058 | rgreig | 2007-09-21 12:06:40 +0100 (Fri, 21 Sep 2007) | 3 lines
QPID-606: synchronize retrieval of application registry to avoid race conditions. This was
particularly affecting systests which use the in-VM broker.
........
................
r578765 | rupertlssmith | 2007-09-24 12:25:46 +0100 (Mon, 24 Sep 2007) | 45 lines
Blocked revisions 578733,578735,578745 via svnmerge
................
r578733 | rupertlssmith | 2007-09-24 10:47:30 +0100 (Mon, 24 Sep 2007) | 1 line
Removed change tracking, to re-init.
................
r578735 | rupertlssmith | 2007-09-24 10:54:24 +0100 (Mon, 24 Sep 2007) | 3 lines
Initialized merge tracking via "svnmerge" with revisions "1-568187,574873,574876,575253,575688,576861,577193,577316,577660,578048,578061" from
https://svn.apache.org/repos/asf/incubator/qpid/branches/M2
................
r578745 | rupertlssmith | 2007-09-24 11:22:32 +0100 (Mon, 24 Sep 2007) | 30 lines
Merged revisions 575663-575687,575689-576860,576862-577192,577194-577315,577317-577659,577661-578047,578049-578060,578062-578604 via svnmerge from
https://svn.apache.org/repos/asf/incubator/qpid/branches/M2
........
r575663 | rgodfrey | 2007-09-14 13:43:13 +0100 (Fri, 14 Sep 2007) | 1 line
QPID-600 : Deadlock on connection.close
........
r577931 | rgreig | 2007-09-20 22:26:37 +0100 (Thu, 20 Sep 2007) | 1 line
Adding timeouts to two wait() calls to prevent hanging
........
r578258 | rgreig | 2007-09-21 21:31:18 +0100 (Fri, 21 Sep 2007) | 1 line
QPID-607: dispatcher threads now poll so that the can die when the connection is closed.
........
r578475 | rgreig | 2007-09-22 20:01:59 +0100 (Sat, 22 Sep 2007) | 1 line
QPID-608 Fix the test by adding in creation of the VM broker
........
r578509 | rgreig | 2007-09-22 23:05:30 +0100 (Sat, 22 Sep 2007) | 1 line
QPID-609 : dispatcher thread was being restarted by the code that closed the consumer due to the receipt of a basic.cancel frame. Move the dispatcher shutdown to the end of the consumer close process. Also rename the dispatcher _closed field since it clashes with a field in the container class.
........
r578604 | rgreig | 2007-09-23 22:29:33 +0100 (Sun, 23 Sep 2007) | 4 lines
QPID-589: avoid the deadlock between the session close and the BasicCancelOkHandler by
not sending a BasicCancel when the session is being closed.
........
................
................
Modified:
incubator/qpid/trunk/qpid/ (props changed)
Propchange: incubator/qpid/trunk/qpid/
------------------------------------------------------------------------------
--- svnmerge-blocked (original)
+++ svnmerge-blocked Mon Sep 24 08:31:36 2007
@@ -1 +1 @@
-/incubator/qpid/branches/M2:532787,532791,537171,539594,540169,540511,553447,565284,574873,574876 /incubator/qpid/branches/qpid.0-9:492777,496596
+/incubator/qpid/branches/M2:532787,532791,537171,539594,540169,540511,553447,565284,574873,574876,575688,577316,577660,578048,578061,578765 /incubator/qpid/branches/qpid.0-9:492777,496596