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 2016/02/02 18:40:22 UTC

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

Branch: refs/heads/3.1.x-fixes
Commit: f7c9fe2f9e3f3ca12b426903be3a1e36e74f9c20
Parents: 24311ae
Author: Daniel Kulp <dk...@apache.org>
Authored: Tue Feb 2 12:09:00 2016 -0500
Committer: Daniel Kulp <dk...@apache.org>
Committed: Tue Feb 2 12:09:00 2016 -0500

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/f7c9fe2f/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 3691749..7aaed2e 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -1,29 +1,54 @@
 origin/master
 B 0234c09c11c0f89bd17f9b82695daa12af1fad09
+B 0336a2399b1980e04372c651368f8718f75a4f14
 B 0d4cd0bbcaa6a4f80552d6b38f2a5e721ab20de9
 B 0dfaf8d72574511ad9027c663707f9e30b945fbc
+B 111d52fd4b92d0222af9bf1c22156145ea01ed01
+B 248c8f0458ce938a65c35006d484c6a4610cde1b
+B 304c62a11b8dbe000cdfb5de857619703bca79f7
+B 343d06d94838cd26f682f7afbcea0e422aa1597d
 B 39851b83af116611ce0efe70c4b9a32ee8491523
+B 3b2f2ed2db01f05fa9b648693ce33978ccc8ede8
+B 47a431412dbd7669d89a70d6fed49053e70dfed1
+B 53a46205871434d8c47ed45822e078e5ad6d2c60
 B 59b8615053ddcad353fbebcd9a5b1109ae0897a1
 B 65e1e07fdb810ec9de135530ca3e3d23821836a3
+B 68f110e5bcfe26d050bd05988ecd9c863e6e8742
 B 6e7b79f6a8b6523b2248937275d92918e5682aa2
+B 77c3f51dcb1f02c8799f4e09676c0697e76a0756
 B 7b7629682d15345518e66d46e575bf1ac334cf00
 B 7fc957efa3a193a5f2ae178b8a608717ce4c5b26
 B 85c397f853c6b7ca0ed6d924445d6173962e1ec4
 B 8a4e85b24d6d5b438ceb28257c53773d46b5816d
 B 8b92fe57dd9a661dab382da7d556b1972f513a93
+B 8f98be8e72d4dbe18347a7efab91f4b008d8385f
+B a219766354d6aee53c7f7a4da91f434af552b437
 B a261507ebd3104b1a00298801ec9815ed1e7a728
 B a7362dfaf2141cb4f303f81bbb94c6df81be75cb
 B bceee342b32f3704ca75176d06067f90c6d3fbdc
+B befeb0484cb195cbcd6163f65c54a94ba26d8335
+B c1eaf69cb16583f672ddef646dcd7a52cfa23b5d
 B ced98c6e937bd93f92dac9043fa0406c696bfd84
+B cf9ab27a843df4532d9bd78209aebcafee2ffffc
+B efb1f0830f5441777198737fb26e9305ab969f66
 B f0e08b7bea2660542e18294d490e68c7b14aaa4b
 B f1b56150d6520e73d2ade2296c3b2f13839e63e5
 B f94e1dd9b2a8d27ec5a27bfb7c026e3ae2350e39
+B f98785bd8490c4717353f1a9688cae3e7a823ec2
 B fb30f8bffc85fcc3208fcc0e1eda4b54a89b5d37
 M 0222768baf6b60742c4a8332308edf2be0f4a2e4
+M 0578e16146527b0782530c40ba2db17531756d96
 M 2e8219cf3d047abc3a7e2611bf284aadbc20b7d6
+M 386805560479b35276d88605c5acf805e3004aa5
+M 39c772a0764b323f98ab58e00345f4fca924c425
+M 63a1088a9253da0452497440e900d35a5415c3c9
+M 746914a5084f5db8d0c0f052802c7ef2217b9b6b
 M 8583a24ac541dc373503d7a6c59cd90890acdae3
+M 8aebfa30047f32e3a6b4feb7ffdd89208ec4f435
+M 8e131133c8566a124605cb06e0b6db98fddb5972
 M 8e650cfe3efd63a06c25b7e912d9d4db61598eb1
 M 9a9e0a8a37608195c4ef6fbf386728d13d025d2d
+M 9ecea375930d1a217f35da65e0d6073f7a80bf7d
 M a1710bdd783afcd667d9e72ccb031480d3806850
 M abcc137cb9b27e0da0b4270a18ac2a32df1e9990
 M fe89bf0fb8379428667f66312e6942e906142d6f