[2/2] cxf git commit: Fixing merge

2017-06-16 Thread coheigea
Fixing merge Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/72c4194a Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/72c4194a Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/72c4194a Branch: refs/heads/2.6.x-fixes

[2/2] cxf git commit: Fixing merge

2016-10-17 Thread coheigea
Fixing merge Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/f91bdce0 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/f91bdce0 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/f91bdce0 Branch: refs/heads/3.0.x-fixes

[2/2] cxf git commit: Fixing merge

2016-01-08 Thread coheigea
Fixing merge Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/6cdfe4ba Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/6cdfe4ba Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/6cdfe4ba Branch: refs/heads/3.0.x-fixes