Author: ay Date: Thu Mar 8 22:52:23 2012 New Revision: 1298638 URL: http://svn.apache.org/viewvc?rev=1298638&view=rev Log: Blocked revisions 1298637 via svnmerge
................ r1298637 | ay | 2012-03-08 23:49:43 +0100 (Thu, 08 Mar 2012) | 17 lines Merged revisions 1298601,1298608,1298624 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1298601 | ay | 2012-03-08 22:46:32 +0100 (Thu, 08 Mar 2012) | 1 line [CXF-4170] JMX InstrumentationManagerImpl's properties may not be read correctly in standalone mode after 2.5.2 ........ r1298608 | ay | 2012-03-08 23:03:27 +0100 (Thu, 08 Mar 2012) | 1 line something went wrong with CXF-4170 fix; temporarily reverting it ........ r1298624 | ay | 2012-03-08 23:26:04 +0100 (Thu, 08 Mar 2012) | 1 line un-reverting the previous commit for CXF-4170 as it looks okay ........ ................ Modified: cxf/branches/2.4.x-fixes/ (props changed) Propchange: cxf/branches/2.4.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-blocked' - no diff available.
