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 2015/04/15 20:23:24 UTC

[6/6] cxf git commit: Recording .gitmergeinfo Changes

Recording .gitmergeinfo Changes


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

Branch: refs/heads/2.7.x-fixes
Commit: 41967da2fc4e052fbe27d30980b121e56edb4d75
Parents: cda90e0
Author: Daniel Kulp <dk...@apache.org>
Authored: Wed Apr 15 14:22:22 2015 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Wed Apr 15 14:23:11 2015 -0400

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/41967da2/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 11d80f6..055edb7 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -1967,6 +1967,7 @@ M 0a2e01f228890abba0bde43a545ea046c9c46119
 M 0a5fc9a53bad9e95d927b8f2730ba5067f2f4c6c
 M 0ad59e8757cd183484053ae7d61995266b2f4760
 M 0b21c66dc0486643f481c9cf31757e2b3293de23
+M 0b29878b914c1f1f3d52dae6ba57702085e348ca
 M 0b3894f57388b9955f2c33b2295223f2835cd7b3
 M 0bbd3da675bd37691bb5bb247fa9ec186dcec45c
 M 0c402ce8092cd9bf9f3390434c56414140267c16