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/b646446a Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/b646446a Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/b646446a Branch: refs/heads/3.0.x-fixes Commit: b646446a55daeece522363bd3afadcaad1a20bb1 Parents: d8f5b21 Author: Daniel Kulp <[email protected]> Authored: Fri Dec 12 14:37:10 2014 -0500 Committer: Daniel Kulp <[email protected]> Committed: Fri Dec 12 14:37:10 2014 -0500 ---------------------------------------------------------------------- .gitmergeinfo | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/b646446a/.gitmergeinfo ---------------------------------------------------------------------- diff --git a/.gitmergeinfo b/.gitmergeinfo index 7470a0c..7c11ad0 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -1,13 +1,18 @@ origin/master B 035154fb466fb9c833804d1bc747804df9e9992b +B 03bd1b4f0beaddf4df112f7c08d5749862805dfa B 04f0ef2e32f55d51f14cfc6d7a14616b62a6cce5 B 08d98fbb13440de2da3b19915d8dfe21531cb284 B 0aaa2b5742a53bf31704939e4bc21906100bbc54 +B 0ba19453f17be19aa2e46848b1908f776a6abb64 B 0c0555f4ac850ec8e38302d73207170affe4376a +B 0de0309f28e1543660c763c158f4353d6d2189be B 11243052a6e1656657776bc3a0c586cba962c49f B 131c3fdba9c4825b739adc3d149d0297175b8a86 +B 13b9b012a31fdf1a7e35757a336fecc3c688848e B 13dfe0f9fcaa0aee4c603072436d85861a0ab734 +B 13e01e23ea87ea5b06953f18bef4b173fca55b4d B 161e10bb2d87573974b8a1748f023c47ebbe5d49 B 162bbb5ea63cfeb6c258d750627c77c9e694f928 B 1674e7fb3353fc9e5d2b81deb2d02617cc09a373 @@ -20,11 +25,14 @@ B 1e927cdfaafb2efc8d29184cb5b7b05ce3c3ad7f B 1f02b3d4f2c9d341046ce35222c8f4d7674b10b2 B 2004b1021ce0d0975eb49cae36416863bd8c59bb B 222137cb2ee577e6582a644b7ae73bbc0a75d4d1 +B 29f0620a9a025afcd2057cdf97c7d93caf6c179f B 2afb9d3cacb299bea854d1ff4824e4c981a41d6a B 2ba77327488a8446e6a92af137f644eaf3b06e2e B 2f0b3e38212674883d610cfcfbd76b901bd3d997 +B 30853113b4c4d47200bcf5305e5e88735f32cc8f B 350b51632f4c5dbd4891636261909c73136981c6 B 36fcf426a4946f57b051ce7a388c7190fc97aebd +B 3834ba2ea50a164cf2b5ffe15229dcf512e110c6 B 384ad75433037358ea1607c4ddcb0cd978fae10c B 388d6eaf045c0215c7cffc891526a402c70625ec B 38bb9fea460262ff2781cbfdf85032d3f4fb9fe1 @@ -44,10 +52,12 @@ B 4f61ca801deed173c648b2d424ac231663acd704 B 4f70bdf4199a666829cf9c6c62c508d12afbe251 B 4fe7844935f9b4ad797760613d143949f9448905 B 51f433d54a1d11eac25c32b0dd69f12fef62c060 +B 55bda33699ea1c2e84a125253edd594cc2a32ea3 B 5e06ba0c4970700477484bd2409a226aa9ec7f0a B 5fbd407bac5af5e55bb280125405d75b7add872b B 6256b7c7c42bb01d2cc0d16d659ba1aa3042e7ae B 64f232307444269286b7f14fc3838b07187d4c03 +B 652d821683f12031258f7727d33157f3ab6ccbe6 B 665eb259fced741f65de061bb026c3ab65a8d99c B 66cc4a4e3c0e92d9e6931a5d416f11c2f07f268c B 67432aef1adb8e330c054431de9d0955e3993472 @@ -57,6 +67,7 @@ B 6e4f0f60785de1f5774644323edafb4741b9e4a4 B 6efe475ad57f042ffc9547f1bb258ab4e16a3f3e B 702f27bc4a334b2d117262252632bf580f20f711 B 71488c6fa7635c88285214a0479379aafef9ed3c +B 71ced4709dedf62264a4bb630aaf4780cb94ce48 B 74a2e6f2b1d9787cc9b5cff4cc84e43cfccbfe94 B 75c69b27a7688dfac281d4acdcff3b0acc4c8bee B 7d1f30f76d95f9eddf0bed995120c71bf1a393b3 @@ -78,6 +89,8 @@ B 92502a5e2af6e5d3c544f89396de2d05d539fd41 B 92c4738f9e6b96fe0ce8586bb36b9c6444d6e225 B 9344b093b8081a68c9f83f0c740d60508e99fd5e B 944eb0ba1043bd4daf9cf087b66bc9cab10b8ff2 +B 94cfe7e48a50104b22457aa47b39d06329d16d32 +B 970feeed0db20bfe9df5095b6b335146344c222c B 9896b920035a1d1be1aef28a1d1a5eb876445c82 B 99963f9a08c9782b7c661f2b5ff8e9ce95ab3dbe B 9dfb278c7739b9f4621f43b8146d057e21fafb64 @@ -93,6 +106,7 @@ B a7c6e78b491c4feb6797a6dddd32a6249189a552 B ab4eaac0be87291b7f053d144dc8fbf9d98634c3 B b18a2bad64c343520795175cf377cdf1b981da2a B b4536602d376a36bcbd02d21d5ab42f19d4e5b22 +B b4872363fda49f205001d4385ecbc35133c2c755 B b54fe0dfdf3c3d76df1e07fb3686d5d8a1061d48 B b5fc90f09c6b039a54564e0825a264310453c550 B b67537dbace0896073b55b375b8ccdc4cce83365 @@ -108,7 +122,9 @@ B cd809b8526fc5620c481d4ee5a8534ccf6babae4 B d0c5c3defab6dbb9619f8fd291f2e06b685cb03c B d391d9371d8505c7774308c4fbbb9bc57ffd34a6 B d3e9295d3acfe3c970a325bbbafdba83a0d6e83c +B d50ffd09c30e606524fb6ed92119d85ccfa13491 B d54a21628143bc15f51cbe5d63fa42c09d0ab8ac +B d8a6bdbd2c84b3fa0187de935e294d5f66974e46 B d9f624e2eca8affa20243583ace087a8cbba3ac8 B df947cb1ca2b9e375f99e199ec65b1afece1c963 B e242307ad8bbe53788f3e03e9e2f0ca977d01340
