You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2014/07/23 22:20:35 UTC

git commit: Update to pull from 3.0.x branch

Repository: cxf
Updated Branches:
  refs/heads/2.7.x-fixes 10199c1e3 -> 7b42f0cea


Update to pull from 3.0.x branch


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/7b42f0ce
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/7b42f0ce
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/7b42f0ce

Branch: refs/heads/2.7.x-fixes
Commit: 7b42f0cea5992ff1e2e54ec215f31d9318bce340
Parents: 10199c1
Author: Daniel Kulp <dk...@apache.org>
Authored: Wed Jul 23 16:18:35 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Wed Jul 23 16:18:35 2014 -0400

----------------------------------------------------------------------
 .gitmergeinfo | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/7b42f0ce/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index a5a9cb3..c7d1232 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -1,4 +1,4 @@
-origin/master
+origin/3.0.x-fixes
 A core api
 A core rt/core
 A rt/wsdl rt/core