Author: rupertlssmith
Date: Tue Nov  6 03:54:10 2007
New Revision: 592393

URL: http://svn.apache.org/viewvc?rev=592393&view=rev
Log:
Blocked revisions 578765,580275,580296,581003,583172,583174,583176,583401 via 
svnmerge

................
  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.
    ........
  ................
................
  r580275 | ritchiem | 2007-09-28 10:48:09 +0100 (Fri, 28 Sep 2007) | 8 lines
  
  Blocked revisions 573737 via svnmerge
  
  ........
    r573737 | rgreig | 2007-09-07 23:33:03 +0100 (Fri, 07 Sep 2007) | 3 lines
    
    QPID-582 Fix for compilation issue under Java 6.
  ........
................
  r580296 | ritchiem | 2007-09-28 11:57:24 +0100 (Fri, 28 Sep 2007) | 12 lines
  
  Blocked revisions 577773,578828 via svnmerge
  
  ........
    r577773 | rgreig | 2007-09-20 15:34:31 +0100 (Thu, 20 Sep 2007) | 2 lines
    
    Updated poms to refer to M2.1 rather than M2
  ........
    r578828 | ritchiem | 2007-09-24 15:28:11 +0100 (Mon, 24 Sep 2007) | 1 line
    
    Updated Example and management pom files to refer to M2.1 rather than M2
  ........
................
  r581003 | rupertlssmith | 2007-10-01 17:13:46 +0100 (Mon, 01 Oct 2007) | 9 
lines
  
  Merged revisions 581002 via svnmerge from 
  https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1
  
  ........
    r581002 | rupertlssmith | 2007-10-01 17:11:34 +0100 (Mon, 01 Oct 2007) | 1 
line
    
    Added missing dependencies to makefile.
  ........
................
  r583172 | rupertlssmith | 2007-10-09 14:55:06 +0100 (Tue, 09 Oct 2007) | 9 
lines
  
  Merged revisions 583170 via svnmerge from 
  https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1
  
  ........
    r583170 | rupertlssmith | 2007-10-09 14:49:32 +0100 (Tue, 09 Oct 2007) | 1 
line
    
    QPID-256 FailoverTest restored to working order. IOExceptions on 
connections now trigger fail-over.
  ........
................
  r583174 | rupertlssmith | 2007-10-09 15:06:00 +0100 (Tue, 09 Oct 2007) | 1 
line
  
  Added to .Net release notes.
................
  r583176 | rupertlssmith | 2007-10-09 15:07:53 +0100 (Tue, 09 Oct 2007) | 9 
lines
  
  Merged revisions 583173 via svnmerge from 
  https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1
  
  ........
    r583173 | rupertlssmith | 2007-10-09 15:05:30 +0100 (Tue, 09 Oct 2007) | 1 
line
    
    Changed exception handler to propagate unknown exceptions to all method 
listeners, rather than throw it back to the caller.
  ........
................
  r583401 | rupertlssmith | 2007-10-10 10:19:05 +0100 (Wed, 10 Oct 2007) | 9 
lines
  
  Merged revisions 583399 via svnmerge from 
  https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1
  
  ........
    r583399 | rupertlssmith | 2007-10-10 10:17:15 +0100 (Wed, 10 Oct 2007) | 1 
line
    
    Removed deleted dependecny FailoverTxTest.
  ........
................

Modified:
    incubator/qpid/branches/M2.1/   (props changed)

Propchange: incubator/qpid/branches/M2.1/
------------------------------------------------------------------------------
Binary property 'svnmerge-blocked' - no diff available.


Reply via email to