Re: svn commit: r1498991 - in /cxf/branches/2.7.x-fixes: ./ api/src/main/java/org/apache/cxf/internal/ rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/blueprint/ rt/bindings/object/src/main/java/org/apache/cxf/binding/object/blueprint/ rt/bind...

[Aki Yoshida <ay...@apache.org>]

it happened to me again. forgot to make sure my local 2.7.x svn is clean
before using domerge.
some other stuff went in with an unrelated merge.
i'll clean them up.


2013/7/2 <ay...@apache.org>

> Author: ay
> Date: Tue Jul  2 15:52:45 2013
> New Revision: 1498991
>
> URL: http://svn.apache.org/r1498991
> Log:
> Merged revisions 1498988 via  svn merge from
> https://svn.apache.org/repos/asf/cxf/trunk
>
> ........
>   r1498988 | ay | 2013-07-02 17:44:55 +0200 (Tue, 02 Jul 2013) | 1 line
>
>   clean up and add another test for CXF-5095
> ........
>
> Added:
>
> cxf/branches/2.7.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WrappedAttachmentsTest.java
>       - copied unchanged from r1498988,
> cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WrappedAttachmentsTest.java
> Modified:
>     cxf/branches/2.7.x-fixes/   (props changed)
>
> cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/internal/CXFAPINamespaceHandler.java
>
> cxf/branches/2.7.x-fixes/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/blueprint/ColocBPNamespaceHandler.java
>
> cxf/branches/2.7.x-fixes/rt/bindings/object/src/main/java/org/apache/cxf/binding/object/blueprint/
>
> cxf/branches/2.7.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/blueprint/RMBPHandler.java
> ...