qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rupertlssm...@apache.org
Subject svn commit: r611230 - /incubator/qpid/branches/M2/
Date Fri, 11 Jan 2008 16:50:37 GMT
Author: rupertlssmith
Date: Fri Jan 11 08:50:36 2008
New Revision: 611230

URL: http://svn.apache.org/viewvc?rev=611230&view=rev
Log:
Blocked revisions 592382,592389,592393,592396,599797,599806 via svnmerge

................
  r592382 | rupertlssmith | 2007-11-06 11:31:46 +0000 (Tue, 06 Nov 2007) | 579 lines
  
  Blocked revisions 578850,580277,580293,580356,580945,580987,581186,581237,581247,581297,581569,581624,581631,582209,582296,583169,583389,583422,583487,583520,583554,583781,583811,584091,584114,584125,585655,585913,585918,586351,586376,586492,587925 via svnmerge
  
  ................
    r578850 | rgodfrey | 2007-09-24 16:25:51 +0100 (Mon, 24 Sep 2007) | 9 lines
    
    Merged revisions 578845 via svnmerge from 
    https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1
    
    ........
      r578845 | rgodfrey | 2007-09-24 15:57:05 +0100 (Mon, 24 Sep 2007) | 1 line
      
      QPID-612 : Use same scheme for every creation of temporary queue names
    ........
  ................
    r580277 | ritchiem | 2007-09-28 10:55:13 +0100 (Fri, 28 Sep 2007) | 25 lines
    
    Merged revisions 573740-574504 via svnmerge from 
    https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1
    
    ........
      r573740 | rgreig | 2007-09-07 23:41:10 +0100 (Fri, 07 Sep 2007) | 3 lines
      
      QPID-583 Added old topic test which had been removed in the past.
    ........
      r574078 | rgreig | 2007-09-09 22:16:32 +0100 (Sun, 09 Sep 2007) | 1 line
      
      QPID-582 Fixing the scripts to run the old topic test
    ........
      r574237 | ritchiem | 2007-09-10 14:08:36 +0100 (Mon, 10 Sep 2007) | 1 line
      
      QPID-585 : Created a new StateManager for each subsequent makeBrokerConnection call during the initial connection. 
    ........
      r574266 | ritchiem | 2007-09-10 15:46:04 +0100 (Mon, 10 Sep 2007) | 1 line
      
      QPID-584 : Client exceptions are now presented via any set Exception Listener 
    ........
      r574504 | rgreig | 2007-09-11 09:10:26 +0100 (Tue, 11 Sep 2007) | 1 line
      
      QPID-582 Fixing build on Java 6
    ........
  ................
    r580293 | ritchiem | 2007-09-28 11:41:49 +0100 (Fri, 28 Sep 2007) | 84 lines
    
    Merged revisions 574555-574873,574875-574901,574903-575737,575739-575787,575789-575810,575812-577772,577774-577940,577942-578057,578059-578732,578734,578736-578744,578746-578827,578829-578844,578846-580022 via svnmerge from 
    https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1
    
    ........
      r574555 | ritchiem | 2007-09-11 12:39:10 +0100 (Tue, 11 Sep 2007) | 1 line
      
      QPID-590 : Provide test case and resolution to prevent deadlock occurring on the client when two threads work on the AMQSession object.
    ........
      r574585 | rgreig | 2007-09-11 14:02:19 +0100 (Tue, 11 Sep 2007) | 1 line
      
      QPID-591 Fixed to use dirname and avoid working directory issues.
    ........
      r579115 | ritchiem | 2007-09-25 09:15:04 +0100 (Tue, 25 Sep 2007) | 1 line
      
      QPID-604 Commited patch provided by Aidan Skinner, to prevent NPE in FieldTable.
    ........
      r579147 | ritchiem | 2007-09-25 10:27:22 +0100 (Tue, 25 Sep 2007) | 2 lines
      
      QPID-610 : Fix for Returned Messages leak. Augmented TestableMemoryMessageStore to allow it to query the MemoryMessageStore in use by the broker. 
      New MessageReturnTest to verify no leak after messages have been returned.
    ........
      r579198 | ritchiem | 2007-09-25 12:13:23 +0100 (Tue, 25 Sep 2007) | 1 line
      
      Update to start M2.1 python test broker on port 2100 (management 2101) and for the tests to use that broker.
    
    MODIFIED: to start on port 2000 and 2001 as this is M2
    
    ........
      r579229 | ritchiem | 2007-09-25 13:51:09 +0100 (Tue, 25 Sep 2007) | 3 lines
      
      QPID-610 : Fix for Get NO_ACK leak. The Java Client doesn't use get so augmented the python test_get to send persistent messages and used debugger to verify that messages were correctly removed. Verified that prior to this commit they would remain in the store. We need a management exchange to fully validate this with a python tests.
      NOTE: The setting of "delivery mode" property on M2.1 is not the same as on trunk where _ is use such as "delivery_mode".
      There is also no error that you have sent an incorrect property.
    ........
      r579574 | ritchiem | 2007-09-26 11:42:54 +0100 (Wed, 26 Sep 2007) | 4 lines
      
      QPID-610 : Fix for ManagementConcole NO_ACK & Msg Expire leaks. Updated AMQQueueMBeanTest to verify the contents of the MessageStore after clearing. 
      All the MC features only dequeued the message and didn't correctly decrementReference.
      The MessageReturnTest was failing due to the TimeToLive test causing messages to be left on the store. The expired messages were not having the reference decremented.
    ........
      r579577 | ritchiem | 2007-09-26 11:45:21 +0100 (Wed, 26 Sep 2007) | 5 lines
      
      Updated TransportConnection to synchronize around the creation/destruction of VM Brokers. I had observed a ConcurrentModificationException in the KillAllVMBrokers().
      
      This isn't good this suggests that the tests are overlapping. This fix won't address that problem but will stop any CModifications occuring. If there is test setup/teardown overlapping we should now see tests failing because the VM broker isn't there.
      
      Potentially addresses VM issues in QPID-596
    ........
      r579578 | ritchiem | 2007-09-26 11:48:14 +0100 (Wed, 26 Sep 2007) | 1 line
      
      Updated the version of slf4j-simple to be one that would work. Changing the systests/pom.xml to depend on this rather than the slf4j-log4j will cause maven to provide more details in the tests. All info and above is logged.
    ........
      r579602 | rupertlssmith | 2007-09-26 12:27:45 +0100 (Wed, 26 Sep 2007) | 1 line
      
      Added timeout to perftests, to fail tests if message loss causes test to jam.
    ........
      r579614 | rupertlssmith | 2007-09-26 12:51:14 +0100 (Wed, 26 Sep 2007) | 1 line
      
      Added timeout to perftests, wait limit set to higher value to stop threads thashing.
    ........
      r579709 | ritchiem | 2007-09-26 17:40:09 +0100 (Wed, 26 Sep 2007) | 1 line
      
      Update for three tests that don't remove their VMBroker
    ........
      r580022 | ritchiem | 2007-09-27 15:27:22 +0100 (Thu, 27 Sep 2007) | 18 lines
      
      QPID-596 : ConnectionStartTest was broken. I've fixed it but here is the problem for those like me that like to know why:
      
      Previously:
      The setUp method created a producer connection and then sent a message
      - This will result in that message being bounced as there is no consumer.
      
      The first test should fail but the test was wrong, which caused it to pass.
      There was an assert that was expecting the receive a message yet the test was recieve() == null !!!!
      
      The second test worked because the broker was not killed between tests
      
      This left the queue created so on the second run the message was delivered causing the test to succeed.
      
      Now:
      Fixed the InVM broker setup/teardown so the client is created first and the broker removed at the end of the test.
      Also updated the asserts to be more explicit rather than having the == null or !=null put that as assertNull/NotNull.
    ........
  ................
    r580356 | rupertlssmith | 2007-09-28 14:55:26 +0100 (Fri, 28 Sep 2007) | 9 lines
    
    Merged revisions 580351 via svnmerge from 
    https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1
    
    ........
      r580351 | rupertlssmith | 2007-09-28 14:47:20 +0100 (Fri, 28 Sep 2007) | 1 line
      
      Updated for changes to the junit-toolkit, new xml test listener moved into the toolkit.
    ........
  ................
    r580945 | ritchiem | 2007-10-01 14:25:51 +0100 (Mon, 01 Oct 2007) | 34 lines
    
    Merged revisions 1-447993,447995-448007,448009-448141,448143-448157,448161-448194,448196-448210,448212-448218,448220-448223,448225-448233,448235,448237-448241,448243-448596,448598-448623,448625-448850,448852-448880,448882-448982,448984-449635,449637-449639,449641-449642,449644-449645,449647-449674,449676-449719,449721-449749,449751-449762,449764-449933,449935-449941,449943-450383,450385,450387-450400,450402-450433,450435-450503,450505-450555,450557-450860,450862-451024,451026-451149,451151-451316,451318-451931,451933-452139,452141-452162,452164-452320,452322,452324-452325,452327-452333,452335-452429,452431-452528,452530-452545,452547-453192,453194-453195,453197-453536,453538,453540-453656,453658-454676,454678-454735,454737,454739-454781,454783-462728,462730-462819,462821-462833,462835-462839,462841-463071,463073-463178,463180-463308,463310-463362,463364-463375,463377-463396,463398-463402,463404-463409,463411-463661,463663-463670,463672-463673,463675-464493,464495-464502,4
 64504-464576,464578-464613,464615-464628,464630,464632-464866,464868-464899,464901-464942,464944-464949,464951-465004,465006-465016,465018-465053,465055-465165,465167-465321,465323-465406,465408-465427,465429-465431,465433-465548,465550-466044,466047-466075,466077,466079-466081,466083-466099,466101-466112,466114-466126,466128-466240,466242-466971,466973-466978,466980-467309,467311-467312,467316-467328,467330-467485,467487-467588,467590-467604,467606-467699,467701-467706,467708-467749,467751-468069,468071-468537,468539-469241,469244-469246,469248-469318,469320-469421,469423,469425-469429,469431-469435,469437-469462,469464-469469,469472-469477,469479-469490,469492-469503,469505-469529,469531-469598,469600-469624,469626-469737,469739-469752,469754-469806,469808-469928,469930-469953,469955-470011,470013-470109,470111-470335,470338-470339,470341-470379,470381,470383-470399,470401-470446,470448-470741,470743-470758,470760-470809,470811-470817,470819-470993,470995-471001,471003-471
 788,471790-471792,471794-472028,472030-472032,472034-472036,472038,472040,472043,472045-472059,472061,472063,472065-472066,472068,472070-472072,472074-472080,472082,472084-472092,472094-472107,472109-472123,472125-472158,472160-472165,472167-472172,472174-472457,472459-472460,472462-472464,472466-472470,472472-472483,472486-472491,472493-472494,472496-472497,472499,472501-472503,472505-472512,472514-472544,472546-472556,472558-472560,472562-472572,472574-472587,472589-472591,472593-472605,472607,472609-472731,472733-472786,472788-472843,472845-472849,472851-472859,472861-472878,472880-472903,472905,472907-472988,472990-472991,472993-473071,473073-473086,473088-473090,473093,473095-473096,473098-473106,473108-473110,473112-473185,473187-473260,473262,473268-473270,473275-473279,473281,473284-473287,473289-473295,473297-473306,473308-473330,473332-473335,473337,473339-473344,473346-473351,473353-473355,473357-473358,473361-473471,473473-473497,473499-473535,473537-473567,47356
 9-473888,473890-474451,474454-474492,474494-474563,474565-474843,474845-474865,474867-474932,474934-475035,475037-475144,475146-475180,475182-475265,475267-475285,475287,475289-475293,475295-475296,475298-475302,475304-475631,475633-475649,475651-475748,475750-475752,475754-476107,476109-476302,476304-476413,476415-476430,476432-476700,476702-476868,476870-477147,477149-477213,477215-477263,477265-477340,477342-477635,477637-477789,477791-477825,477827-477841,477843,477846-477852,477854,477856,477858-477865,477867-477894,477896-478022,478024-478182,478184-478211,478213-478233,478235-478236,478238-478241,478243-478252,478254-478259,478261-478263,478265,478267-478269,478271-478286,478288-478342,478344-478379,478381-478412,478414-478443,478445-478636,478639-478658,478660-478821,478823-478853,478855-478922,478924-478962,478965-478974,478976-479029,479031-479049,479051-479210,479212-479214,479216-479407,479409-479415,479417-479425,479427-479559,479561-479639,479641-479676,479678-
 479685,479687-480030,480033-480086,480091-480093,480095-480118,480120-480139,480141,480143-480148,480150-480156,480158-480163,480165-480177,480179-480189,480191-480193,480195-480198,480200-480220,480222-480282,480284-480292,480294-480308,480310-480317,480320-480422,480424,480426-480581,480583-480656,480658-480692,480695-480702,480704,480706-480710,480712-480910,480913-480933,480935-480945,480947-480972,480974-480993,480995-481034,481036-481158,481161-481174,481176-481220,481222-481234,481236-481260,481263-481264,481266-481296,481298-481304,481306-481311,481313-481332,481334,481336-481380,481382-481441,481443-482144,482146-482180,482182-482193,482195-482232,482234-482236,482239,482241-482242,482244-482247,482250-482251,482253,482256-482261,482264-482288,482290-482364,482366,482368,482370-482554,482556,482558-482569,482572-482636,482638,482640-482696,482698-482722,482724-482732,482734-482771,482774-482957,482959-483045,483047-483105,483108,483110-483115,483117,483119-483127,48
 3130-483134,483136-483148,483150-483158,483160-483164,483166-483178,483180-483391,483393-483400,483402-483403,483405-483418,483420-483421,483425-483436,483438-483470,483472-483502,483504-483558,483560-483599,483601-483637,483639-483644,483646-483659,483661-483670,483672-483878,483880-483910,483912-483915,483917-483940,483942,483944-483968,483970-483972,483974-483976,483978,483980-484612,484614-484657,484659-484693,484695-484718,484720-484842,484844-484847,484849-484986,484988-485019,485021-485489,485491-485544,485546-485591,485593,485595-485697,485699-485729,485731-485734,485736-485779,485781-485787,485789-485851,485853,485855-486007,486009,486011-486020,486022-486083,486085-486097,486099-486117,486120-486131,486133-486148,486150-486161,486163-486164,486166-486197,486199-486205,486208-486247,486249-486253,486256-486427,486429-486431,486433-486554,486556-486573,486575-486593,486595,486597-486609,486611-486619,486622,486625,486627-486641,486643-486645,486649-486687,486689-4867
 21,486723-486730,486732-486746,486748-486759,486761,486763-486777,486779-486782,486784-486788,486790,486792,486794-486796,486798-487175,487178,487180-487213,487215,487217-487267,487269-487284,487286-487298,487300-487358,487360-487367,487369-487382,487384-487434,487436-487480,487482-487547,487549-487561,487563-487565,487567-487578,487580-487615,487617-487622,487624,487626,487628,487630-487635,487637-487703,487705-487777,487780-487781,487783-487800,487802-487803,487805-487820,487822-487848,487850-487902,487904-488103,488105-488133,488135-488158,488160-488163,488165-488187,488189-488216,488218-488248,488250-488278,488280,488282-488303,488305-488313,488315-488342,488344-488351,488353-488376,488378-488449,488451-488593,488595,488597-488623,488625-488700,488702-488704,488706-488710,488714,488716-488725,488727-488744,488746-488770,488772-488798,488800,488802-488807,488809,488811-488829,488831-488843,488845-488851,488853-489069,489071-489077,489079-489081,489084-489102,489104-489105
 ,489107-489109,489111-489112,489114-489139,489141-489178,489181-489203,489205-489211,489213,489216-489329,489332-489402,489404-489417,489419-489421,489423-489643,489645-489690,489692-489703,489705-489714,489716-489747,489749-489753,489755-489803,489805-489904,489906-490372,490374-490504,490506-490604,490606-490707,490710-490733,490735-490871,490873-490984,490986-491028,491030,491032-491071,491073-491119,491121-491576,491578-491672,491674-491800,491802-491838,491840-491878,491880-492183,492185-492279,492281-492317,492319-492513,492515-492584,492586-492587,492589-492601,492603-492635,492637-492640,492642-492717,492719-492723,492725-492729,492731-492755,492757-492901,492903-492955,492957-492962,492964-492997,492999-493002,493004-493041,493043-493059,493062-493063,493065-493086,493088-493125,493127-493139,493141-493150,493152-493871,493873-494017,494019-494030,494032-494041,494043-494091,494093-494120,494122-494354,494356-494436,494438-494539,494541-494552,494554-494586,494588-4
 94649,494651,494653-494654,494656-494657,494659-494764,494766-494768,494770-494796,494798-494799,494802,494804-494860,494862-494903,494905-494906,494908-495019,495021-495160,495162-495168,495171-495188,495190-495229,495231-495254,495256-495303,495305-495313,495315-495336,495338-495372,495374-495379,495381-495454,495457-495459,495462-495516,495518-495524,495526-495531,495533-495548,495551-495553,495555,495557-495558,495560,495562-495573,495575-495583,495585-495594,495596-495628,495630-495638,495640-495651,495653-495660,495662-495753,495755-496259,496261-496262,496264-496269,496271-496275,496277-496301,496303-496316,496318-496383,496385-496413,496415-496495,496497-496625,496627-496636,496638-496640,496642-496647,496650-496657,496659-496660,496663-496664,496666-496677,496679-496681,496683-496730,496732-496750,496752,496754-496784,496786-496832,496834-496840,496842-496990,496992-496995,496997-497340,497343-497351,497353-497403,497405-497424,497426-497438,497440-497481,497483-497
 497,497499-497765,497767-497769,497771-497775,497777-497778,497780,497782-497783,497785,497787-497812,497814-497871,497873-497877,497879-498573,498575-498588,498590,498592,498594-498636,498638-498669,498671-498686,498688-498689,498691-498719,498721-498964,498966-498969,498971-498973,498975-498982,498985-499035,499037-499040,499042,499044-499048,499050-499082,499084-499086,499088-499164,499167-499169,499171-499355,499357-499370,499372-499373,499375-499391,499393,499395-499425,499428,499430-499445,499447-499455,499457-499460,499462-499465,499467,499469-499489,499491-499492,499494-499531,499533-499562,499566-499627,499629-499715,499717-499732,499734-499755,499758-499763,499765-499780,499782-499795,499797-499802,499804-499844,499846,499848-499850,499852-499863,499865-499873,499875-499974,499976-499978,499980-500263,500265-500283,500285-500309,500311-501000,501002,501012-501057,501059-501095,501097-501390,501392-501410,501413-501447,501449-501454,501456,501458-501464,501466-50147
 1,501473-501803,501805-501913,501915-501916,501918-501919,501921-501944,501946-502171,502173-502177,502181,502183-502247,502250-502252,502254-502260,502262-502267,502270,502272,502274-502575,502577-502609,502611-502619,502621-502626,502628-502654,502656-503592,503594-503603,503605-503608,503610-503636,503638-503645,503647-503705,503707-503789,503791-504024,504026-504111,504113-504506,504508-504735,504737-504863,504865-504867,504869-504914,504916-505241,505243-505254,505257-505267,505269-505354,505356-505891,505893-505971,505973-506400,506402-506404,506407-506438,506440-506516,506518-506541,506543-506966,506968-506971,506973-507095,507097-507108,507111-507454,507456,507459-507471,507473-507556,507558,507560-507581,507585-507594,507597,507599-507608,507610-507728,507730-507893,507895-507937,507940-508234,508236-508350,508352-508365,508367-508380,508383,508386-508415,508417-508648,508650-508941,508943-509146,509148-509171,509173-509175,509179-509201,509203-509207,509209-509215,
 509217-509222,509224-509477,509480-509627,509629-509634,509636-509641,509643-509736,509738-509931,509933-510059,510061-510075,510077-510158,510161-510896,510898-510938,510940-511388,511390-511922,511924-512287,512289-512698,512702-512813,512815-512817,512819-513359,513361-513370,513372-514702,514704-514886,514888-514902,514904-515126,515129-515141,515143-515516,515518-515534,515536-515538,515540-515648,515650-515651,515653-516070,516072-516411,516413-516448,516450,516452-517637,517639-517647,517649-517659,517661-517663,517665-517677,517679-517682,517684-517744,517746-518085,518087-518175,518177-518558,518560-518568,518571-518666,518668,518670-518699,518701-518987,518990-518992,518994-519908,519910-519932,519934-520414,520416-520842,520844-520937,520939-521362,521364-521681,521683-521704,521706-521709,521711-521714,521716-521781,521783-521792,521794-522462,522464-522527,522529-522534,522536-522566,522568-522958,522960,522962-522966,522968-522976,522978-522980,522982-522988,52
 2992-522993,522995-523244,523246-523746,523748-524049,524051-524738,524741-524742,524744-524762,524764,524766,524768-525486,525488-525530,525532,525534,525537-525552,525554-525765,525767-525776,525778-525784,525789-525803,525805-525816,525818-525828,525830-525861,525863-525866,525868-526090,526092-526112,526114-526116,526119-526121,526123-526149,526151-526153,526155-526156,526160-526165,526167-526186,526188-526193,526196-526197,526200-526665,526667-526682,526686-526690,526693,526695-526708,526710-526713,526715-526775,526777-526802,526804-526806,526808-527048,527051-527052,527054-527181,527183-527486,527488-527492,527494-527498,527500-527508,527510-527517,527519-527536,527538-527555,527559-527802,527804-527842,527844-527847,527849-527875,527877-527940,527942-527958,527960-527971,527973-528002,528004,528006-528423,528425-529232,529234-529245,529247-529296,529298-529634,529636-529658,529660-529665,529667-529668,529670-530033,530035-530036,530038-530040,530045-530046,530050-5300
 51,530053-530431,530433-530436,530439-530440,530443,530445-530446,530448,530450-530682,530684,530687-530696,530698-530733,530735-530776,530778-530795,530799,530801-530811,530813-530818,530820-530837,530839-531436,531438-531455,531457,531459-531511,531514,531516,531519-531523,531525,531528-531858,531860-531864,531866-531907,531909-531916,531918-531936,531938-531988,531990-532001,532003-532371,532373-532465,532467-532727,532729-532765,532767-532785,532788-532790,532792-532793,532795-533064,533066-533074,533076,533080-533130,533132-533139,533142-533703,533705-533720,533722-533763,533766-533818,533820-533839,533841-533859,533862-534035,534037-534112,534114-534116,534118-534472,534474-534477,534479-534762,534764-534896,534898-534902,534904-535253,535255-535308,535310-535808,535810-535873,535875-536007,536009-536140,536142-536162,536165-536242,536244-536252,536254-536278,536280-536338,536340-536448,536450-536479,536481-536482,536484-536485,536487-536495,536497,536500-536505,536507
 -536561,536563-536570,536572,536574-536583,536586-536823,536825-537014,537016-537018,537020-537025,537027-537028,537030-537160,537162-537170,537172-537672,537674-537781,537783-537833,537836-537840,537842-537844,537846-537953,537955-538034,538036-538078,538080-538083,538085-538097,538099-538108,538110-538239,538241-538881,538883-538906,538908-538911,538913-538921,538923-539177,539179-539190,539192-539469,539471-539475,539477-539480,539482-539483,539485-539500,539502-539593,539595-539782,539784-539787,539789-540106,540108-540168,540170-540510,540512-541246,541248-541919,541921-542483,542485-542788,542790-543495,543497-544108,544110-544421,544423-544507,544509-544865,544867-545145,545147-546095,546097-546189,546191-546440,546442-546457,546459-547177,547179-547626,547628-548275,548277-548278,548280-548301,548303-548307,548309-548311,548313-548314,548316,548318,548320-548380,548382-549010,549012-549111,549113-549529,549531-549848,549850-550508,550510-550747,550749-550772,550774-5
 50848,550850-551116,551122-551166,551168-551173,551177-552440,552442-552498,552500-553171,553173-553247,553249-553264,553266-553431,553433-553446,553448-553479,553481,553483-554963,554965-555248,555250-556010,556012-556023,556025-556627,556629-556674,556676-556679,556681,556683-556844,556846,556848-556860,556862-556867,556870,556873-556887,556889,556891-556897,556899-556957,556959-556966,556970-557275,557277-557278,557280,557282-557285,557287,557289-557305,557307-557311,557313,557315-557451,557453-558026,558028-558071,558073-558082,558084-558098,558100-558107,558109-558113,558117-558167,558169,558171-558629,558631-559418,559420-559426,559428-559454,559457,559459-559460,559462-559942,559945-560197,560199-560224,560226-560470,560472-561277,561279-561793,561795-561854,561856-562058,562060-562065,562067-562082,562084-562123,562126-563433,563436-563439,563441-563495,563498-563527,563530-563531,563533-563985,563987-564592,564594-564617,564620-565283,565285-565702,565704-566642,566
 645-566664,566666-567002,567004,567006-568918,568920-568923,568925-573501,573503-573515,573517-573736,573738-573739,573741-574077,574079-574236,574238-574265,574267-574503,574505-574554,574556-574584,574586-574873,574875-574901,574903-575737,575739-575787,575789-575810,575812-577772,577774-577940,577942-578057,578059-578732,578734,578736-578744,578746-578827,578829-578844,578846-579114,579116-579146,579148-579197,579199-579228,579230-579573,579575-579576,579579-579601,579603-579613,579615-579708,579710-580021,580023-580350,580352-580941 via svnmerge from 
    https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1
    
    ........
      r580040 | rupertlssmith | 2007-09-27 15:50:42 +0100 (Thu, 27 Sep 2007) | 1 line
      
      Added test cases 4 and 5, for message size tests.
    ........
      r580041 | rupertlssmith | 2007-09-27 15:51:35 +0100 (Thu, 27 Sep 2007) | 1 line
      
      Removed accidentally checked in .o file.
    ........
      r580061 | rupertlssmith | 2007-09-27 16:23:33 +0100 (Thu, 27 Sep 2007) | 1 line
      
      Added test cases 4 and 5, from the updated interop spec.
    ........
      r580066 | rupertlssmith | 2007-09-27 16:32:31 +0100 (Thu, 27 Sep 2007) | 1 line
      
      Added test cases 4 and 5, from the updated interop spec.
    ........
      r580081 | rupertlssmith | 2007-09-27 17:24:57 +0100 (Thu, 27 Sep 2007) | 1 line
      
      Interop test case 5 fix.
    ........
      r580258 | ritchiem | 2007-09-28 10:04:03 +0100 (Fri, 28 Sep 2007) | 2 lines
      
      QPID-597 : TopicSessionTest Failure, Patch supplied by Aidan Skinner.
      ResetMessageListenerTest.java was changing the prefetch method via a system property that propogated to all tests.
    ........
      r580265 | ritchiem | 2007-09-28 10:26:15 +0100 (Fri, 28 Sep 2007) | 2 lines
      
      QPID-611 : Queue Total size calculations can cause NPE on broker. Patch supplied by Aidan Skinner
    ........
  ................
    r580987 | rupertlssmith | 2007-10-01 16:15:37 +0100 (Mon, 01 Oct 2007) | 9 lines
    
    Merged revisions 580985 via svnmerge from 
    https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1
    
    ........
      r580985 | rupertlssmith | 2007-10-01 16:11:14 +0100 (Mon, 01 Oct 2007) | 1 line
      
      QPID-618, QPID-619, patch supplied by Aidan Skinner, test timeout increased.
    ........
  ................
    r581186 | ritchiem | 2007-10-02 11:37:52 +0100 (Tue, 02 Oct 2007) | 13 lines
    
    Merged revisions 580992-580993 via svnmerge from 
    https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1
    
    ........
      r580992 | ritchiem | 2007-10-01 16:27:54 +0100 (Mon, 01 Oct 2007) | 1 line
      
      QPID-595 CommitRollbackTest Patch provided by Aidan Skinner to address intermittent test failure.
    ........
      r580993 | ritchiem | 2007-10-01 16:31:00 +0100 (Mon, 01 Oct 2007) | 1 line
      
      QPID-611 QPID-620. DurableSubscriptionTest was failing due to a race condition when using NO_ACK. This is due to the Queue Total Size being updated after the send, but after the send and NO_ACK the msg data is purged and so there is no size to retrieve. Changed all references to msg.dequeue to queue.dequeue where appropriate so we can use that single point in the future for updating the Queue Total Size.
    ........
  ................
    r581237 | rupertlssmith | 2007-10-02 14:46:00 +0100 (Tue, 02 Oct 2007) | 13 lines
    
    Merged revisions 581171-581188,581190-581207 via svnmerge from 
    https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1
    
    ........
      r581171 | rupertlssmith | 2007-10-02 10:36:47 +0100 (Tue, 02 Oct 2007) | 1 line
      
      Updated poms to use 0.6-SNAPSHOT version of junit-toolkit and plugin consistently.
    ........
      r581207 | rupertlssmith | 2007-10-02 13:28:37 +0100 (Tue, 02 Oct 2007) | 1 line
      
      QPID-616. Corrected pending message count and pending data size calculations for pubsub testing.
    ........
  ................
    r581247 | rupertlssmith | 2007-10-02 15:07:22 +0100 (Tue, 02 Oct 2007) | 9 lines
    
    Merged revisions 581246 via svnmerge from 
    https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1
    
    ........
      r581246 | rupertlssmith | 2007-10-02 15:05:30 +0100 (Tue, 02 Oct 2007) | 1 line
      
      Turned down logging on perftests again.
    ........
  ................
    r581297 | rupertlssmith | 2007-10-02 17:45:22 +0100 (Tue, 02 Oct 2007) | 9 lines
    
    Merged revisions 581293 via svnmerge from 
    https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1
    
    ........
      r581293 | rupertlssmith | 2007-10-02 17:29:15 +0100 (Tue, 02 Oct 2007) | 1 line
      
      QPID-615, Added patched version of MINAs VM Pipe cleanup thread. Will replace once bug fix is in newer version of MINA.
    ........
  ................
    r581569 | rupertlssmith | 2007-10-03 12:35:40 +0100 (Wed, 03 Oct 2007) | 14 lines
    
    Merged revisions 581540-581566 via svnmerge from 
    https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1
    
    ........
      r581540 | ritchiem | 2007-10-03 10:32:22 +0100 (Wed, 03 Oct 2007) | 2 lines
      
      QPID-617 : Transactional consume does not ack messages.
      Problem is that we were not classing msgs as consumed until onMessage completed in the transactional case. This patch corrects that.
    ........
      r581566 | rupertlssmith | 2007-10-03 12:23:08 +0100 (Wed, 03 Oct 2007) | 1 line
      
      Added reliability tests for all ack modes.
    ........
  ................
    r581624 | ritchiem | 2007-10-03 16:23:32 +0100 (Wed, 03 Oct 2007) | 9 lines
    
    Merged revisions 581621 via svnmerge from 
    https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1
    
    ........
      r581621 | ritchiem | 2007-10-03 16:15:52 +0100 (Wed, 03 Oct 2007) | 1 line
      
      QPID-584 : Fixed issue where ALL errors are presented to client as a connection closing error.
    ........
  ................
    r581631 | ritchiem | 2007-10-03 16:37:04 +0100 (Wed, 03 Oct 2007) | 13 lines
    
    Merged revisions 573738-573739,573741-574077,574079-574236,574238-574265,574267-574503,574505-574554,574556-574584,574586-574873,574875-574901,574903-575737,575739-575787,575789-575810,575812-577772,577774-577940,577942-578057,578059-578732,578734,578736-578744,578746-578827,578829-578844,578846-579114,579116-579146,579148-579197,579199-579228,579230-579573,579575-579576,579579-579601,579603-579613,579615-579708,579710-580021,580023-580039,580042-580060,580062-580065,580067-580080,580082-580257,580259-580264,580266-580350,580352-580984,580986-580991,580994-581001,581003-581170,581172-581206,581208-581245,581247-581292,581294-581539,581541-581565,581567-581620,581622-581628 via svnmerge from 
    https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1
    
    ........
      r581189 | rgodfrey | 2007-10-02 12:08:29 +0100 (Tue, 02 Oct 2007) | 1 line
      
      QPID-614 : Applied patch supplied by Aidan Skinner
    ........
      r581627 | ritchiem | 2007-10-03 16:26:10 +0100 (Wed, 03 Oct 2007) | 1 line
      
      QPID-614 : Applied supplementary patch from Aidan Skinner.
    ........
  ................
    r582209 | rupertlssmith | 2007-10-05 12:11:55 +0100 (Fri, 05 Oct 2007) | 9 lines
    
    Merged revisions 582205 via svnmerge from 
    https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1
    
    ........
      r582205 | rupertlssmith | 2007-10-05 11:57:09 +0100 (Fri, 05 Oct 2007) | 1 line
      
      Turned down test size and rate parameters for pubsub tests.
    ........
  ................
    r582296 | ritchiem | 2007-10-05 15:59:21 +0100 (Fri, 05 Oct 2007) | 33 lines
    
    Merged revisions 573738-573739,573741-574077,574079-574236,574238-574265,574267-574503,574505-574554,574556-574584,574586-574873,574875-574901,574903-575737,575739-575787,575789-575810,575812-577772,577774-577940,577942-578057,578059-578732,578734,578736-578744,578746-578827,578829-578844,578846-579114,579116-579146,579148-579197,579199-579228,579230-579573,579575-579576,579579-579601,579603-579613,579615-579708,579710-580021,580023-580039,580042-580060,580062-580065,580067-580080,580082-580257,580259-580264,580266-580350,580352-580984,580986-580991,580994-581001,581003-581170,581172-581188,581190-581206,581208-581245,581247-581292,581294-581539,581541-581565,581567-581620,581622-581626,581628-581646,581648-582204,582206-582269 via svnmerge from 
    https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1
    
    ........
      r581968 | rupertlssmith | 2007-10-04 17:57:40 +0100 (Thu, 04 Oct 2007) | 1 line
      
      Updaded performance tests to better test pub/sub mode with 1:10 fanout.
    ........
      r582198 | ritchiem | 2007-10-05 11:33:14 +0100 (Fri, 05 Oct 2007) | 1 line
      
      QPID-617 : Forgot to commit Test case to validate fix.
    ........
      r582201 | ritchiem | 2007-10-05 11:39:54 +0100 (Fri, 05 Oct 2007) | 1 line
      
      QPID-624: Update to ensure all errors are correctly processed in BlockingMethodFrameListener.java
    ........
      r582202 | ritchiem | 2007-10-05 11:44:06 +0100 (Fri, 05 Oct 2007) | 1 line
      
      QPID-624 : Forgot to commit updates to test along with BlockingMethodFrameListener
    ........
      r582263 | ritchiem | 2007-10-05 14:38:13 +0100 (Fri, 05 Oct 2007) | 1 line
      
      Qpid-623 : When only selectors are used on a queue the main _messages queue causes a leak. Here is a new test provided by Aidan Skinner and a simple fix that will prevent OOME when only selectors are connected to the Queue.
    ........
      r582265 | ritchiem | 2007-10-05 14:39:03 +0100 (Fri, 05 Oct 2007) | 1 line
      
      Qpid-558 : Patch provided by Aidan Skinner addressing AMQShortString not autoexpand-ing so when adding content to it would throw an exception
    ........
      r582266 | ritchiem | 2007-10-05 14:39:25 +0100 (Fri, 05 Oct 2007) | 1 line
      
      QPID-551 : Patch provided by Aidan Skinner to address problems in info logging when stacktraces are short.
    ........
  ................
    r583169 | ritchiem | 2007-10-09 14:45:25 +0100 (Tue, 09 Oct 2007) | 30 lines
    
    Merged revisions 573738-573739,573741-574077,574079-574236,574238-574265,574267-574503,574505-574554,574556-574584,574586-574873,574875-574901,574903-575737,575739-575787,575789-575810,575812-577772,577774-577940,577942-578057,578059-578732,578734,578736-578744,578746-578827,578829-578844,578846-579114,579116-579146,579148-579197,579199-579228,579230-579573,579575-579576,579579-579601,579603-579613,579615-579708,579710-580021,580023-580039,580042-580060,580062-580065,580067-580080,580082-580257,580259-580264,580266-580350,580352-580984,580986-580991,580994-581001,581003-581170,581172-581188,581190-581206,581208-581245,581247-581292,581294-581539,581541-581565,581567-581620,581622-581626,581628-581646,581648-581967,581969-582197,582199-582200,582203-582204,582206-582262,582264,582267-583156 via svnmerge from 
    https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1
    
    ........
      r583085 | ritchiem | 2007-10-09 10:25:00 +0100 (Tue, 09 Oct 2007) | 1 line
      
      Update to Error message to contain the thrown exception message.
    ........
      r583086 | ritchiem | 2007-10-09 10:29:08 +0100 (Tue, 09 Oct 2007) | 2 lines
      
      Update to provide a UUID.randomUUID() when getLocalHost() throws an UnknownHostException.
      Update to formatting
    ........
      r583088 | ritchiem | 2007-10-09 10:31:40 +0100 (Tue, 09 Oct 2007) | 1 line
      
      Update to correct error log that would occur when using selectors.
    ........
      r583105 | rgodfrey | 2007-10-09 11:48:25 +0100 (Tue, 09 Oct 2007) | 1 line
      
      QPID-625 : Fix commit rollback test to prevent failures caused by incorrect assertions in the test
    ........
      r583147 | ritchiem | 2007-10-09 14:11:41 +0100 (Tue, 09 Oct 2007) | 1 line
      
      Qpid-626 : Patch provided by Aidan Skinner to address AMQSession Deadlocks.
    ........
      r583154 | ritchiem | 2007-10-09 14:19:37 +0100 (Tue, 09 Oct 2007) | 1 line
      
      Qpid-627 Patch provided by Aidan Skinner to address hangs in DurableSubscriptionTest.
    ........
  ................
    r583389 | rgodfrey | 2007-10-10 09:51:27 +0100 (Wed, 10 Oct 2007) | 9 lines
    
    Merged revisions 583105 via svnmerge from 
    https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1
    
    ........
      r583105 | rgodfrey | 2007-10-09 11:48:25 +0100 (Tue, 09 Oct 2007) | 1 line
      
      QPID-625 : Fix commit rollback test to prevent failures caused by incorrect assertions in the test
    ........
  ................
    r583422 | ritchiem | 2007-10-10 11:41:34 +0100 (Wed, 10 Oct 2007) | 13 lines
    
    Merged revisions 573738-573739,573741-574077,574079-574236,574238-574265,574267-574503,574505-574554,574556-574584,574586-574873,574875-574901,574903-575737,575739-575787,575789-575810,575812-577772,577774-577940,577942-578057,578059-578732,578734,578736-578744,578746-578827,578829-578844,578846-579114,579116-579146,579148-579197,579199-579228,579230-579573,579575-579576,579579-579601,579603-579613,579615-579708,579710-580021,580023-580039,580042-580060,580062-580065,580067-580080,580082-580257,580259-580264,580266-580350,580352-580984,580986-580991,580994-581001,581003-581170,581172-581188,581190-581206,581208-581245,581247-581292,581294-581539,581541-581565,581567-581620,581622-581626,581628-581646,581648-581967,581969-582197,582199-582200,582203-582204,582206-582262,582264,582267-583084,583087,583089-583104,583106-583146,583148-583153,583155-583169,583171-583172,583174-583398,583400-583418 via svnmerge from 
    https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1
    
    ........
      r583415 | ritchiem | 2007-10-10 10:59:56 +0100 (Wed, 10 Oct 2007) | 1 line
      
      QPID-578 : Queue Deletion causes unacked msgs to be discard resulting in the RejcectHandler throwing NPE when it too tries to discard the message.
    ........
      r583418 | ritchiem | 2007-10-10 11:11:13 +0100 (Wed, 10 Oct 2007) | 1 line
      
      QPID-627 : Update provided by Aidan Skinner to correctly close resources used by Large Message Test.
    ........
  ................
    r583487 | rupertlssmith | 2007-10-10 15:29:02 +0100 (Wed, 10 Oct 2007) | 13 lines
    
    Merged revisions 583438-583483 via svnmerge from 
    https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1
    
    ........
      r583438 | rupertlssmith | 2007-10-10 12:46:59 +0100 (Wed, 10 Oct 2007) | 1 line
      
      Changed tests to use global maxPending limit, rather than per producer.
    ........
      r583483 | rupertlssmith | 2007-10-10 15:21:20 +0100 (Wed, 10 Oct 2007) | 1 line
      
      Removed debug logging from performance test code.
    ........
  ................
    r583520 | rupertlssmith | 2007-10-10 16:47:38 +0100 (Wed, 10 Oct 2007) | 9 lines
    
    Merged revisions 583518 via svnmerge from 
    https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1
    
    ........
      r583518 | rupertlssmith | 2007-10-10 16:45:56 +0100 (Wed, 10 Oct 2007) | 1 line
      
      Changed maxPending to be by message correlation id.
    ........
  ................
    r583554 | ritchiem | 2007-10-10 18:44:52 +0100 (Wed, 10 Oct 2007) | 13 lines
    
    Merged revisions 573738-573739,573741-574077,574079-574236,574238-574265,574267-574503,574505-574554,574556-574584,574586-574873,574875-574901,574903-575737,575739-575787,575789-575810,575812-577772,577774-577940,577942-578057,578059-578732,578734,578736-578744,578746-578827,578829-578844,578846-579114,579116-579146,579148-579197,579199-579228,579230-579573,579575-579576,579579-579601,579603-579613,579615-579708,579710-580021,580023-580039,580042-580060,580062-580065,580067-580080,580082-580257,580259-580264,580266-580350,580352-580984,580986-580991,580994-581001,581003-581170,581172-581188,581190-581206,581208-581245,581247-581292,581294-581539,581541-581565,581567-581620,581622-581626,581628-581646,581648-581967,581969-582197,582199-582200,582203-582204,582206-582262,582264,582267-583084,583087,583089-583104,583106-583146,583148-583153,583155-583169,583171-583172,583174-583398,583400-583414,583416-583417,583419-583437,583439-583482,583484-583517,583519-583550 via svnmer
 ge from 
    https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1
    
    ........
      r583546 | ritchiem | 2007-10-10 18:14:53 +0100 (Wed, 10 Oct 2007) | 1 line
      
      QPID-631 : Patch provided by Aidan Skinner to address the errors in the MessageRequeueTest.
    ........
      r583548 | ritchiem | 2007-10-10 18:15:59 +0100 (Wed, 10 Oct 2007) | 2 lines
      
      QPID-632 : The lack of AMQNoConsumersException on the connection may be due to the exception list in ExceptionMonitor not being thread safe. Synchronized method calls to ensure atomic access.
    ........
  ................
    r583781 | ritchiem | 2007-10-11 12:46:10 +0100 (Thu, 11 Oct 2007) | 13 lines
    
    Merged revisions 573738-573739,573741-574077,574079-574236,574238-574265,574267-574503,574505-574554,574556-574584,574586-574873,574875-574901,574903-575737,575739-575787,575789-575810,575812-577772,577774-577940,577942-578057,578059-578732,578734,578736-578744,578746-578827,578829-578844,578846-579114,579116-579146,579148-579197,579199-579228,579230-579573,579575-579576,579579-579601,579603-579613,579615-579708,579710-580021,580023-580039,580042-580060,580062-580065,580067-580080,580082-580257,580259-580264,580266-580350,580352-580984,580986-580991,580994-581001,581003-581170,581172-581188,581190-581206,581208-581245,581247-581292,581294-581539,581541-581565,581567-581620,581622-581626,581628-581646,581648-581967,581969-582197,582199-582200,582203-582204,582206-582262,582264,582267-583084,583087,583089-583104,583106-583146,583148-583153,583155-583169,583171-583172,583174-583398,583400-583414,583416-583417,583419-583437,583439-583482,583484-583517,583519-583545,583547,583
 549-583777 via svnmerge from 
    https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1
    
    ........
      r583775 | ritchiem | 2007-10-11 12:24:36 +0100 (Thu, 11 Oct 2007) | 1 line
      
      QPID-635 Added a unit test and implemented the equals() method on BlockingMethodFrameListener and SpecificMethodFrameListener.
    ........
      r583776 | ritchiem | 2007-10-11 12:28:36 +0100 (Thu, 11 Oct 2007) | 1 line
      
      QPID-632 ImmediateMessageTest may not have sufficient time to see the exception. Performing the close before checking for exceptions should give it this time.
    ........
  ................
    r583811 | ritchiem | 2007-10-11 13:57:32 +0100 (Thu, 11 Oct 2007) | 9 lines
    
    Merged revisions 573738-573739,573741-574077,574079-574236,574238-574265,574267-574503,574505-574554,574556-574584,574586-574873,574875-574901,574903-575737,575739-575787,575789-575810,575812-577772,577774-577940,577942-578057,578059-578732,578734,578736-578744,578746-578827,578829-578844,578846-579114,579116-579146,579148-579197,579199-579228,579230-579573,579575-579576,579579-579601,579603-579613,579615-579708,579710-580021,580023-580039,580042-580060,580062-580065,580067-580080,580082-580257,580259-580264,580266-580350,580352-580984,580986-580991,580994-581001,581003-581170,581172-581188,581190-581206,581208-581245,581247-581292,581294-581539,581541-581565,581567-581620,581622-581626,581628-581646,581648-581967,581969-582197,582199-582200,582203-582204,582206-582262,582264,582267-583084,583087,583089-583104,583106-583146,583148-583153,583155-583169,583171-583172,583174-583398,583400-583414,583416-583417,583419-583437,583439-583482,583484-583517,583519-583545,583547,583
 549-583774,583777-583809 via svnmerge from 
    https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1
    
    ........
      r583808 | ritchiem | 2007-10-11 13:52:02 +0100 (Thu, 11 Oct 2007) | 1 line
      
      QPID-636 : Check to ensure we only enqueue msgs that can be delivered to the consumer.
    ........
  ................
    r584091 | ritchiem | 2007-10-12 08:33:24 +0100 (Fri, 12 Oct 2007) | 9 lines
    
    Merged revisions 573738-573739,573741-574077,574079-574236,574238-574265,574267-574503,574505-574554,574556-574584,574586-574873,574875-574901,574903-575737,575739-575787,575789-575810,575812-577772,577774-577940,577942-578057,578059-578732,578734,578736-578744,578746-578827,578829-578844,578846-579114,579116-579146,579148-579197,579199-579228,579230-579573,579575-579576,579579-579601,579603-579613,579615-579708,579710-580021,580023-580039,580042-580060,580062-580065,580067-580080,580082-580257,580259-580264,580266-580350,580352-580984,580986-580991,580994-581001,581003-581170,581172-581188,581190-581206,581208-581245,581247-581292,581294-581539,581541-581565,581567-581620,581622-581626,581628-581646,581648-581967,581969-582197,582199-582200,582203-582204,582206-582262,582264,582267-583084,583087,583089-583104,583106-583146,583148-583153,583155-583169,583171-583172,583174-583398,583400-583414,583416-583417,583419-583437,583439-583482,583484-583517,583519-583545,583547,583
 549-583774,583777-583807,583809-583882 via svnmerge from 
    https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1
    
    ........
      r583882 | ritchiem | 2007-10-11 18:02:28 +0100 (Thu, 11 Oct 2007) | 1 line
      
      QPID-637 Patch submitted by Aidan Skinner to address receive not waiting for full timeout.
    ........
  ................
    r584114 | rupertlssmith | 2007-10-12 10:57:49 +0100 (Fri, 12 Oct 2007) | 13 lines
    
    Merged revisions 573738-573739,573741-574077,574079-574236,574238-574265,574267-574503,574505-574554,574556-574584,574586-574873,574875-574901,574903-575737,575739-575787,575789-575810,575812-577772,577774-577940,577942-578057,578059-578732,578734,578736-578744,578746-578827,578829-578844,578846-579114,579116-579146,579148-579197,579199-579228,579230-579573,579575-579576,579579-579601,579603-579613,579615-579708,579710-580021,580023-580039,580042-580060,580062-580065,580067-580080,580082-580257,580259-580264,580266-580350,580352-580984,580986-580991,580994-581001,581003-581170,581172-581188,581190-581206,581208-581245,581247-581292,581294-581539,581541-581565,581567-581620,581622-581626,581628-581646,581648-581967,581969-582197,582199-582200,582203-582204,582206-582262,582264,582267-583084,583087,583089-583104,583106-583146,583148-583153,583155-583169,583171-583172,583174-583398,583400-583414,583416-583417,583419-583437,583439-583482,583484-583517,583519-583545,583547,583
 549-583774,583777-583807,583809-583881,583883-584113 via svnmerge from 
    https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1
    
    ........
      r584108 | rupertlssmith | 2007-10-12 10:43:28 +0100 (Fri, 12 Oct 2007) | 1 line
      
      Changed topic reliability tests to do 2:16 fanout, gives highest rate.
    ........
      r584113 | rupertlssmith | 2007-10-12 10:55:01 +0100 (Fri, 12 Oct 2007) | 1 line
      
      Corrected error in topic test sizes.
    ........
  ................
    r584125 | rupertlssmith | 2007-10-12 11:55:02 +0100 (Fri, 12 Oct 2007) | 9 lines
    
    Merged revisions 584124 via svnmerge from 
    https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1
    
    ........
      r584124 | rupertlssmith | 2007-10-12 11:52:52 +0100 (Fri, 12 Oct 2007) | 1 line
      
      Implemented fair scheduling of producers in tests to prevent starvation and test timeout.
    ........
  ................
    r585655 | rgodfrey | 2007-10-17 20:59:58 +0100 (Wed, 17 Oct 2007) | 21 lines
    
    Merged revisions 573738-573739,573741-574077,574079-574236,574238-574265,574267-574503,574505-574554,574556-574584,574586-574873,574875-574901,574903-575737,575739-575787,575789-575810,575812-577772,577774-577940,577942-578057,578059-578732,578734,578736-578744,578746-578827,578829-578844,578846-579114,579116-579146,579148-579197,579199-579228,579230-579573,579575-579576,579579-579601,579603-579613,579615-579708,579710-580021,580023-580039,580042-580060,580062-580065,580067-580080,580082-580257,580259-580264,580266-580350,580352-580984,580986-580991,580994-581001,581003-581170,581172-581188,581190-581206,581208-581245,581247-581292,581294-581539,581541-581565,581567-581620,581622-581626,581628-581646,581648-581967,581969-582197,582199-582200,582203-582204,582206-582262,582264,582267-583084,583087,583089-583104,583106-583146,583148-583153,583155-583169,583171-583172,583174-583398,583400-583414,583416-583417,583419-583437,583439-583482,583484-583517,583519-583545,583547,583
 549-583774,583777-583807,583809-583881,583883-584107,584109-584112,584114-584123,584125-585653 via svnmerge from 
    https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1
    
    ........
      r585565 | ritchiem | 2007-10-17 17:39:20 +0100 (Wed, 17 Oct 2007) | 1 line
      
      QPID-643 : CSDM causes duplicate message delivery. Don't deliver messages that have been taken.
    ........
      r585570 | ritchiem | 2007-10-17 17:48:01 +0100 (Wed, 17 Oct 2007) | 1 line
      
      Update to AMQMessage to reset the deliveredToConsumer flag(false) when the message is released. This flag is now used by more than the immediate delivery. It is also used to understand if the message has been delivered so that we can tell the message should not be purged.
    ........
      r585575 | ritchiem | 2007-10-17 17:59:42 +0100 (Wed, 17 Oct 2007) | 1 line
      
      QPID-647 : Update to ConcurrentSelectorDeliveryManager to restart async process if a msg is queued that has the potential to be delivered.
    ........
      r585642 | rgodfrey | 2007-10-17 20:42:14 +0100 (Wed, 17 Oct 2007) | 1 line
      
      QPID-645 : TxnBuffer should rethrow exceptions encountered on commit
    ........
  ................
    r585913 | ritchiem | 2007-10-18 11:11:41 +0100 (Thu, 18 Oct 2007) | 9 lines
    
    Merged revisions 573738-573739,573741-574077,574079-574236,574238-574265,574267-574503,574505-574554,574556-574584,574586-574873,574875-574901,574903-575737,575739-575787,575789-575810,575812-577772,577774-577940,577942-578057,578059-578732,578734,578736-578744,578746-578827,578829-578844,578846-579114,579116-579146,579148-579197,579199-579228,579230-579573,579575-579576,579579-579601,579603-579613,579615-579708,579710-580021,580023-580039,580042-580060,580062-580065,580067-580080,580082-580257,580259-580264,580266-580350,580352-580984,580986-580991,580994-581001,581003-581170,581172-581188,581190-581206,581208-581245,581247-581292,581294-581539,581541-581565,581567-581620,581622-581626,581628-581646,581648-581967,581969-582197,582199-582200,582203-582204,582206-582262,582264,582267-583084,583087,583089-583104,583106-583146,583148-583153,583155-583169,583171-583172,583174-583398,583400-583414,583416-583417,583419-583437,583439-583482,583484-583517,583519-583545,583547,583
 549-583774,583777-583807,583809-583881,583883-584107,584109-584112,584114-584123,584125-585564,585566-585569,585571-585574,585576-585641,585643-585908 via svnmerge from 
    https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1
    
    ........
      r585906 | ritchiem | 2007-10-18 10:09:38 +0100 (Thu, 18 Oct 2007) | 1 line
      
      QPID-647 : Async Process start/stop is not regulated tightly enough. Added additional synchronisation to ensure that a new subscriber can start the async if required. As currently the start request can be missed.
    ........
  ................
    r585918 | ritchiem | 2007-10-18 11:29:45 +0100 (Thu, 18 Oct 2007) | 9 lines
    
    Merged revisions 573738-573739,573741-574077,574079-574236,574238-574265,574267-574503,574505-574554,574556-574584,574586-574873,574875-574901,574903-575737,575739-575787,575789-575810,575812-577772,577774-577940,577942-578057,578059-578732,578734,578736-578744,578746-578827,578829-578844,578846-579114,579116-579146,579148-579197,579199-579228,579230-579573,579575-579576,579579-579601,579603-579613,579615-579708,579710-580021,580023-580039,580042-580060,580062-580065,580067-580080,580082-580257,580259-580264,580266-580350,580352-580984,580986-580991,580994-581001,581003-581170,581172-581188,581190-581206,581208-581245,581247-581292,581294-581539,581541-581565,581567-581620,581622-581626,581628-581646,581648-581967,581969-582197,582199-582200,582203-582204,582206-582262,582264,582267-583084,583087,583089-583104,583106-583146,583148-583153,583155-583169,583171-583172,583174-583398,583400-583414,583416-583417,583419-583437,583439-583482,583484-583517,583519-583545,583547,583
 549-583774,583777-583807,583809-583881,583883-584107,584109-584112,584114-584123,584125-585564,585566-585569,585571-585574,585576-585641,585643-585905,585907-585914 via svnmerge from 
    https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1
    
    ........
      r585912 | ritchiem | 2007-10-18 11:10:19 +0100 (Thu, 18 Oct 2007) | 1 line
      
      QPID-637 : Patch provided by Aidan Skinner to ensure correct behaviour of session closure.
    ........
  ................
    r586351 | ritchiem | 2007-10-19 10:46:45 +0100 (Fri, 19 Oct 2007) | 9 lines
    
    Merged revisions 573738-573739,573741-574077,574079-574236,574238-574265,574267-574503,574505-574554,574556-574584,574586-574873,574875-574901,574903-575737,575739-575787,575789-575810,575812-577772,577774-577940,577942-578057,578059-578732,578734,578736-578744,578746-578827,578829-578844,578846-579114,579116-579146,579148-579197,579199-579228,579230-579573,579575-579576,579579-579601,579603-579613,579615-579708,579710-580021,580023-580039,580042-580060,580062-580065,580067-580080,580082-580257,580259-580264,580266-580350,580352-580984,580986-580991,580994-581001,581003-581170,581172-581188,581190-581206,581208-581245,581247-581292,581294-581539,581541-581565,581567-581620,581622-581626,581628-581646,581648-581967,581969-582197,582199-582200,582203-582204,582206-582262,582264,582267-583084,583087,583089-583104,583106-583146,583148-583153,583155-583169,583171-583172,583174-583398,583400-583414,583416-583417,583419-583437,583439-583482,583484-583517,583519-583545,583547,583
 549-583774,583777-583807,583809-583881,583883-584107,584109-584112,584114-584123,584125-585564,585566-585569,585571-585574,585576-585641,585643-585905,585907-585911,585913-586344 via svnmerge from 
    https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1
    
    ........
      r586344 | rgodfrey | 2007-10-19 10:29:50 +0100 (Fri, 19 Oct 2007) | 1 line
      
      QPID-653 : Updated timeouts
    ........
  ................
    r586376 | ritchiem | 2007-10-19 12:05:11 +0100 (Fri, 19 Oct 2007) | 9 lines
    
    Merged revisions 573738-573739,573741-574077,574079-574236,574238-574265,574267-574503,574505-574554,574556-574584,574586-574873,574875-574901,574903-575737,575739-575787,575789-575810,575812-577772,577774-577940,577942-578057,578059-578732,578734,578736-578744,578746-578827,578829-578844,578846-579114,579116-579146,579148-579197,579199-579228,579230-579573,579575-579576,579579-579601,579603-579613,579615-579708,579710-580021,580023-580039,580042-580060,580062-580065,580067-580080,580082-580257,580259-580264,580266-580350,580352-580984,580986-580991,580994-581001,581003-581170,581172-581188,581190-581206,581208-581245,581247-581292,581294-581539,581541-581565,581567-581620,581622-581626,581628-581646,581648-581967,581969-582197,582199-582200,582203-582204,582206-582262,582264,582267-583084,583087,583089-583104,583106-583146,583148-583153,583155-583169,583171-583172,583174-583398,583400-583414,583416-583417,583419-583437,583439-583482,583484-583517,583519-583545,583547,583
 549-583774,583777-583807,583809-583881,583883-584107,584109-584112,584114-584123,584125-585564,585566-585569,585571-585574,585576-585641,585643-585905,585907-585911,585913-586343,586345-586374 via svnmerge from 
    https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1
    
    ........
      r586374 | ritchiem | 2007-10-19 12:01:40 +0100 (Fri, 19 Oct 2007) | 1 line
      
      QPID-654 : added a shutdownNow() call if the _taskPool hasn't terminiated by the time we have finished closing.
    ........
  ................
    r586492 | ritchiem | 2007-10-19 16:03:01 +0100 (Fri, 19 Oct 2007) | 11 lines
    
    Merged revisions 573738-573739,573741-574077,574079-574236,574238-574265,574267-574503,574505-574554,574556-574584,574586-574873,574875-574901,574903-575737,575739-575787,575789-575810,575812-577772,577774-577940,577942-578057,578059-578732,578734,578736-578744,578746-578827,578829-578844,578846-579114,579116-579146,579148-579197,579199-579228,579230-579573,579575-579576,579579-579601,579603-579613,579615-579708,579710-580021,580023-580039,580042-580060,580062-580065,580067-580080,580082-580257,580259-580264,580266-580350,580352-580984,580986-580991,580994-581001,581003-581170,581172-581188,581190-581206,581208-581245,581247-581292,581294-581539,581541-581565,581567-581620,581622-581626,581628-581646,581648-581967,581969-582197,582199-582200,582203-582204,582206-582262,582264,582267-583084,583087,583089-583104,583106-583146,583148-583153,583155-583169,583171-583172,583174-583398,583400-583414,583416-583417,583419-583437,583439-583482,583484-583517,583519-583545,583547,583
 549-583774,583777-583807,583809-583881,583883-584107,584109-584112,584114-584123,584125-585564,585566-585569,585571-585574,585576-585641,585643-585905,585907-585911,585913-586343,586345-586373,586375-586489 via svnmerge from 
    https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1
    
    ........
      r586489 | ritchiem | 2007-10-19 16:01:15 +0100 (Fri, 19 Oct 2007) | 3 lines
      
      QPID-647 : Update to ConcurrentSelectorDeliveryManager to restart async process if a msg is queued that has the potential to be delivered. 
      
      Delayed the restart until the Filtering subscribers have the message enqueued to their PDQs.
    ........
  ................
    r587925 | rupertlssmith | 2007-10-24 17:42:24 +0100 (Wed, 24 Oct 2007) | 9 lines
    
    Merged revisions 573738-573739,573741-574077,574079-574236,574238-574265,574267-574503,574505-574554,574556-574584,574586-574873,574875-574901,574903-575737,575739-575787,575789-575810,575812-577772,577774-577940,577942-578057,578059-578732,578734,578736-578744,578746-578827,578829-578844,578846-579114,579116-579146,579148-579197,579199-579228,579230-579573,579575-579576,579579-579601,579603-579613,579615-579708,579710-580021,580023-580039,580042-580060,580062-580065,580067-580080,580082-580257,580259-580264,580266-580350,580352-580984,580986-580991,580994-581001,581003-581170,581172-581188,581190-581206,581208-581245,581247-581292,581294-581539,581541-581565,581567-581620,581622-581626,581628-581646,581648-581967,581969-582197,582199-582200,582203-582204,582206-582262,582264,582267-583084,583087,583089-583104,583106-583146,583148-583153,583155-583169,583171-583172,583174-583398,583400-583414,583416-583417,583419-583437,583439-583482,583484-583517,583519-583545,583547,583
 549-583774,583777-583807,583809-583881,583883-584107,584109-584112,584114-584123,584125-585564,585566-585569,585571-585574,585576-585641,585643-585905,585907-585911,585913-586343,586345-586373,586375-586488,586490-587922 via svnmerge from 
    https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1
    
    ........
      r587922 | rupertlssmith | 2007-10-24 17:32:14 +0100 (Wed, 24 Oct 2007) | 1 line
      
      Resolved junit-toolkit SNAPSHOT dependencies onto version 0.6.1 which is in the central repository.
    ........
  ................
................
  r592389 | rupertlssmith | 2007-11-06 11:41:11 +0000 (Tue, 06 Nov 2007) | 47 lines
  
  Blocked revisions 579126,579137,581648,582313,582843,590774,591036,591060,591091 via svnmerge
  
  ................
    r579126 | rgreig | 2007-09-25 09:42:53 +0100 (Tue, 25 Sep 2007) | 2 lines
    
    QPID-582: fix some 1.6 compile errors
  ................
    r579137 | rgreig | 2007-09-25 10:00:34 +0100 (Tue, 25 Sep 2007) | 2 lines
    
    QPID-582 fix Java 6 compile errors
  ................
    r581648 | rupertlssmith | 2007-10-03 17:32:09 +0100 (Wed, 03 Oct 2007) | 9 lines
    
    Merged revisions 581647 via svnmerge from 
    https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1
    
    ........
      r581647 | rupertlssmith | 2007-10-03 17:28:38 +0100 (Wed, 03 Oct 2007) | 1 line
      
      Performance enhancements for the tests, producers stalled individually above maxPending size.
    ........
  ................
    r582313 | ritchiem | 2007-10-05 16:28:23 +0100 (Fri, 05 Oct 2007) | 1 line
    
    Sorry in my fixing of a conflict I put the M2.1 pom references on M2.
  ................
    r582843 | rupertlssmith | 2007-10-08 16:15:33 +0100 (Mon, 08 Oct 2007) | 1 line
    
    Updated pom to match tests parameters from 2.1, confusing during previos merge caused these values to be lost.
  ................
    r590774 | rajith | 2007-10-31 18:21:04 +0000 (Wed, 31 Oct 2007) | 1 line
    
    Changed the POMs to remove SNAPSHOT from the version
  ................
    r591036 | rajith | 2007-11-01 14:57:17 +0000 (Thu, 01 Nov 2007) | 1 line
    
    modified the systest POM
  ................
    r591060 | rajith | 2007-11-01 15:48:31 +0000 (Thu, 01 Nov 2007) | 2 lines
    
    Changed the release notes
  ................
    r591091 | ritchiem | 2007-11-01 17:15:54 +0000 (Thu, 01 Nov 2007) | 1 line
    
    Completed the removal of SNAPSHOT from all M2 pom.xml files.
  ................
................
  r592393 | rupertlssmith | 2007-11-06 11:54:10 +0000 (Tue, 06 Nov 2007) | 123 lines
  
  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.
    ........
  ................
................
  r592396 | rupertlssmith | 2007-11-06 11:59:18 +0000 (Tue, 06 Nov 2007) | 21 lines
  
  Merged revisions 587061-587924,587926-590773,590775-591035,591037-591059,591061-591090,591092-592353 via svnmerge from 
  https://svn.apache.org/repos/asf/incubator/qpid/branches/M2
  
  ........
    r587061 | rupertlssmith | 2007-10-22 12:29:41 +0100 (Mon, 22 Oct 2007) | 1 line
    
    Updated benchmark tests for max throughput and a variety of latency tests modeling common use cases.
  ........
    r588581 | rupertlssmith | 2007-10-26 10:32:11 +0100 (Fri, 26 Oct 2007) | 1 line
    
    Resized latency tests.
  ........
    r590133 | rupertlssmith | 2007-10-30 16:02:24 +0000 (Tue, 30 Oct 2007) | 1 line
    
    Resized some benchmark tests to scale up to the saturation point.
  ........
    r592353 | rupertlssmith | 2007-11-06 10:05:25 +0000 (Tue, 06 Nov 2007) | 1 line
    
    Changed perf test parameters.
  ........
................
  r599797 | rupertlssmith | 2007-11-30 12:26:06 +0000 (Fri, 30 Nov 2007) | 20 lines
  
  Blocked revisions 595695-595696,596351,596363 via svnmerge
  
  ........
    r595695 | rajith | 2007-11-16 15:16:03 +0000 (Fri, 16 Nov 2007) | 2 lines
    
    Creating the tag for M2 release
  ........
    r595696 | rajith | 2007-11-16 15:17:48 +0000 (Fri, 16 Nov 2007) | 1 line
    
    I moved the branch to a tag instead of copying by mistake,I am undoing the mistake by reversing it
  ........
    r596351 | rajith | 2007-11-19 16:17:15 +0000 (Mon, 19 Nov 2007) | 2 lines
    
    Creating a new tag for M2 final release
  ........
    r596363 | rajith | 2007-11-19 16:54:44 +0000 (Mon, 19 Nov 2007) | 1 line
    
    Undoing the accidental move instead of a copy
  ........
................
  r599806 | rupertlssmith | 2007-11-30 12:49:02 +0000 (Fri, 30 Nov 2007) | 54 lines
  
  Merged revisions 594992-595694,595697-596350,596352-596362,596364-598327 via svnmerge from 
  https://svn.apache.org/repos/asf/incubator/qpid/branches/M2
  
  ........
    r594992 | ritchiem | 2007-11-14 18:00:28 +0000 (Wed, 14 Nov 2007) | 1 line
    
    QPID-685 : Update to address dependency issues and update the NOTICE file.
  ........
    r595687 | rajith | 2007-11-16 14:54:01 +0000 (Fri, 16 Nov 2007) | 1 line
    
    moved the keys file to the parent folder
  ........
    r595688 | rajith | 2007-11-16 15:00:22 +0000 (Fri, 16 Nov 2007) | 1 line
    
    removed the KEYS file, as now it is in the parent folder
  ........
    r595740 | ritchiem | 2007-11-16 17:06:04 +0000 (Fri, 16 Nov 2007) | 1 line
    
    Fixed runtime dependency in the management console.
  ........
    r596342 | rajith | 2007-11-19 15:56:29 +0000 (Mon, 19 Nov 2007) | 1 line
    
    added eclipse license details to the NOTICE file
  ........
    r596650 | ritchiem | 2007-11-20 13:14:32 +0000 (Tue, 20 Nov 2007) | 1 line
    
    Added the full text of the additional licenses.
  ........
    r596655 | ritchiem | 2007-11-20 13:22:53 +0000 (Tue, 20 Nov 2007) | 2 lines
    
    Added the full text of the additional licenses.
    Moved ICU licence text from NOTICE to LICENSE
  ........
    r596657 | gsim | 2007-11-20 13:32:25 +0000 (Tue, 20 Nov 2007) | 3 lines
    
    Added boost license
  ........
    r596665 | ritchiem | 2007-11-20 13:49:34 +0000 (Tue, 20 Nov 2007) | 1 line
    
    Added source links for EPL and MPL libraries
  ........
    r598292 | rupertlssmith | 2007-11-26 14:45:15 +0000 (Mon, 26 Nov 2007) | 1 line
    
    Added incubator disclaimer.
  ........
    r598311 | rupertlssmith | 2007-11-26 15:40:54 +0000 (Mon, 26 Nov 2007) | 1 line
    
    Added AMQP licence information.
  ........
    r598327 | rajith | 2007-11-26 16:04:50 +0000 (Mon, 26 Nov 2007) | 1 line
    
    added disclaimers and AMP license to all languages
  ........
................

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

Propchange: incubator/qpid/branches/M2/
------------------------------------------------------------------------------
--- svnmerge-blocked (original)
+++ svnmerge-blocked Fri Jan 11 08:50:36 2008
@@ -1 +1 @@
-/incubator/qpid/branches/M2.1:573737,577773,578733,578735,578745,578828
+/incubator/qpid/branches/M2.1:573737,577773,578733,578735,578745,578828,592382,592389,592393,592396,599797,599806



Mime
View raw message