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/06/13 17:29:38 UTC

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

Branch: refs/heads/2.7.x-fixes
Commit: ddaf7a73a411bbce4d6ac1183aade968939a16e8
Parents: d1e26db
Author: Daniel Kulp <dk...@apache.org>
Authored: Fri Jun 13 11:05:13 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Fri Jun 13 11:05:13 2014 -0400

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/ddaf7a73/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 9030aaa..8f4fca9 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -321,6 +321,7 @@ B 44204faaabc25977c42846ff27914294b6384079
 B 445c6ddae4952653ebad7ea15e23c42f51063b3f
 B 447d50a7f375f3133f7bb472e67819da4088aae8
 B 44b25ebe870e4d86b8c6d1c1aa945278e5e8ca3f
+B 44b35f1193552619bf6ff843254a5db0b8104263
 B 44de359f3e33b5cec829848f253e3a092c9989be
 B 454a6f84e0accbae7647b537fc9f5402df85e881
 B 458b211d7fd31e1440537ab445f3dbec0c5f7534
@@ -957,6 +958,7 @@ B da877145dcfad9de38aa92e92f5b0d1d2c9a20b3
 B da8972f3d4e92b18f464009ec27228cef0069da5
 B dac9e8404e0854813c8ed97e181eb3e0cf24b474
 B dae56b90c1de0dce1c00abe12108e364934eccf7
+B db2f02a91c7a9fb7ef88c34475f8a97d46a7ffad
 B db328134ef7acd3d7d46163666d5f6f4c59a8712
 B db6d55988ee70dfa3e751d4de13cac43005fc3f6
 B db84f3f6128c4c670f1b328a5aeb6b2617af48a9
@@ -1092,6 +1094,7 @@ B f7326964676a63a89a62892f9994d95aae16a68d
 B f761107ca5f9e2172fa159d31317df1a6fbd5df5
 B f8c17ef0a99195ea18c54c8718fa3f1d5e7cb41c
 B f8e3111979f85cbb612cbf1d6bc2e090d08adf6e
+B f912f16cf94631d09ab7be7241687b8e8696625f
 B f9b4939d483b43eb72ad165f995e763ce6bc34d8
 B f9b7c426504623033043960f81fdf6991f661e20
 B f9d34aa106502f8f74f2475de3c10f942c9d2cb5
@@ -1361,6 +1364,7 @@ M 635578a9d0a4cc1087795c26479585998d4a828f
 M 6358dc0577bb2ff41f91a6c3ac121a75d3da1a6e
 M 637963158121f8cd21e68b20f31c521c86048248
 M 63dce4850acf497e08cc692c5ad03d3d0788eae9
+M 63e985d05127a64dbfa6acfbb5c0f3ffb916fad5
 M 63f922255e228e4310335ad0b73309a66b735744
 M 643a6962ca28c2ad5b93ad0bff4309de372c261e
 M 652fab32f3ae5ffa3b4cb6290d654eadbdfd39a2
@@ -1414,6 +1418,7 @@ M 7c5edcc97b0702602d5fd2dc2324031efefe6430
 M 7d3bc771c321be9bc09816611b52e3c0e04323ef
 M 7f4f3630c35dbe78d9bbff2359a128db52b8cd8c
 M 7f75a2fc5a71f646d8647cf9b5e697f763e1edf2
+M 7fbe3b69b4e43f49cdfffc3c812c8d2ed29b3275
 M 7fd02d12a94352b7ce5a0260906a90997342dc42
 M 82c9c7d40f5dbfe905b9c7c7f59ed44c3634a003
 M 82cde9eefdf806ca1df735f350b4ae452ef84ca0
@@ -1470,6 +1475,7 @@ M 9bb928f7541c61a8a47c6a89db95155aad3153d0
 M 9c18083ec68a06a239104e58e497cb9bb5f745b4
 M 9c4675b7977e08fd9d6391313d13f0f8e08062cb
 M 9cf4485bc7843523da41d4b7095ff4f3430a05a9
+M 9ef7c5ebad8e5b26de79705056d20cb8bc92a107
 M 9f0a203134db988344ac0f4d71eb838e7c70784c
 M 9fa2780b617ed626f22d238ed1d3a39186b0f293
 M 9fc1a684696319f5ab1ced3924dd239abfc5a24a