You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@cxf.apache.org by ay...@apache.org on 2013/07/03 17:00:37 UTC

svn commit: r1499434 - in /cxf/branches/2.6.x-fixes: ./ rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/blueprint/

Author: ay
Date: Wed Jul  3 15:00:36 2013
New Revision: 1499434

URL: http://svn.apache.org/r1499434
Log:
Merged revisions 1499431 via  svn merge from
https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes

........
  r1499431 | ay | 2013-07-03 16:54:49 +0200 (Wed, 03 Jul 2013) | 9 lines
  
  Merged revisions 1499424 via  svn merge from
  https://svn.apache.org/repos/asf/cxf/trunk
  
  ........
    r1499424 | ay | 2013-07-03 16:41:10 +0200 (Wed, 03 Jul 2013) | 1 line
    
    forgot to include with CXF-5102 test
  ........
  
........

Added:
    cxf/branches/2.6.x-fixes/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/blueprint/
      - copied from r1499431, cxf/branches/2.7.x-fixes/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/blueprint/
Modified:
    cxf/branches/2.6.x-fixes/   (props changed)

Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.