Author: sergeyb Date: Fri Mar 2 16:19:31 2012 New Revision: 1296282 URL: http://svn.apache.org/viewvc?rev=1296282&view=rev Log: Merged revisions 1296281 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
................ r1296281 | sergeyb | 2012-03-02 16:18:01 +0000 (Fri, 02 Mar 2012) | 9 lines Merged revisions 1296277 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1296277 | sergeyb | 2012-03-02 16:16:13 +0000 (Fri, 02 Mar 2012) | 1 line [CXF-4153] Adding the missing test file ........ ................ Added: cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/search/BeanspectorTest.java - copied unchanged from r1296281, cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/search/BeanspectorTest.java Modified: cxf/branches/2.4.x-fixes/ (props changed) Propchange: cxf/branches/2.4.x-fixes/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Mar 2 16:19:31 2012 @@ -1,2 +1,2 @@ -/cxf/branches/2.5.x-fixes:1296273 -/cxf/trunk:1296270 +/cxf/branches/2.5.x-fixes:1296273,1296281 +/cxf/trunk:1296270,1296277 Propchange: cxf/branches/2.4.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available.
