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/10/27 20:48:25 UTC

[3/4] 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/01d7f1f3
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/01d7f1f3
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/01d7f1f3

Branch: refs/heads/2.7.x-fixes
Commit: 01d7f1f3ec19d7c375769e744180fbf0191baa9d
Parents: fe24026
Author: Daniel Kulp <dk...@apache.org>
Authored: Mon Oct 27 14:04:23 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Mon Oct 27 14:04:23 2014 -0400

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/01d7f1f3/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 8053328..dd27357 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -1430,6 +1430,7 @@ B f206aab7a0b641388e608af91866b5ddb317bdd4
 B f2284040e8269ae8fe4cabe54b1b916abd26016d
 B f28f777f7a4cd31c32fa08d26fc7892e4bc1f89f
 B f29557a3b144603eab65068b6776d823683dab87
+B f2bc4d4315ad661284946e3cd213d8e5f7cdd715
 B f32709f86d7f1aefb23a60c705d6d658d7b958e2
 B f34899128e0e27850a3cc31bbf58658290931506
 B f3497b00bd89e2978d605425c98f93fd310f442e
@@ -1949,6 +1950,7 @@ M a3f7f142a17da0d0fecd4fa039c07ba6e2496d49
 M a40358aedb488fdf517955ead872d0f832625ec6
 M a4903d384fff5d10d24400750522e07dd158970a
 M a4a5b4fb19362f33b5b1255aff61d9edf51628a1
+M a4d82fe2908471335bebd85a88728605aff15084
 M a4e4ea126e7f68d4f7c5de02aad5eaab50ac2a96
 M a5272604a833f7fb53514428ef04a3bc9a550e79
 M a5b6a887d813d793a6b236162ff85211c35759ab