Repository: cxf Updated Branches: refs/heads/3.0.x-fixes 5ae190595 -> e1885f1a2
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/15585242 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/15585242 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/15585242 Branch: refs/heads/3.0.x-fixes Commit: 155852427a7f9f14ace64a93295f175a9bae2d0c Parents: 5ae1905 Author: Daniel Kulp <[email protected]> Authored: Fri Sep 12 14:19:56 2014 -0400 Committer: Daniel Kulp <[email protected]> Committed: Mon Sep 15 11:17:13 2014 -0400 ---------------------------------------------------------------------- .gitmergeinfo | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/15585242/.gitmergeinfo ---------------------------------------------------------------------- diff --git a/.gitmergeinfo b/.gitmergeinfo index a615d67..8751e85 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -1,27 +1,42 @@ origin/master B 08d98fbb13440de2da3b19915d8dfe21531cb284 +B 0aaa2b5742a53bf31704939e4bc21906100bbc54 B 0c0555f4ac850ec8e38302d73207170affe4376a +B 11243052a6e1656657776bc3a0c586cba962c49f B 131c3fdba9c4825b739adc3d149d0297175b8a86 B 13dfe0f9fcaa0aee4c603072436d85861a0ab734 B 161e10bb2d87573974b8a1748f023c47ebbe5d49 +B 162bbb5ea63cfeb6c258d750627c77c9e694f928 +B 1674e7fb3353fc9e5d2b81deb2d02617cc09a373 B 1824d9cae26c3b141d873d0d01036602ac339c37 +B 1b3f01b4f640beea1f1247416ad9891e615f816c +B 1d29dfaa8e686570c1b2ec2da4c31ba380e0b9b0 B 2004b1021ce0d0975eb49cae36416863bd8c59bb +B 2afb9d3cacb299bea854d1ff4824e4c981a41d6a +B 384ad75433037358ea1607c4ddcb0cd978fae10c +B 38bb9fea460262ff2781cbfdf85032d3f4fb9fe1 B 3b1a8cc3a8c1b213a8f6728ae9154cf14c9c1300 +B 43aa455461fb8a33b0e5844512b263a262c2420c B 46838d8a346687e9f8ff2f6e279e3ba83f99c5f3 B 470bdcb40597dce5e5cf957000ab60b0b4c1fce4 B 478de215af2da2c03f439bbbd8341b234bb7bee8 B 481466c7a42a57c87c992a02ab560be046bf5797 B 4f61ca801deed173c648b2d424ac231663acd704 +B 4f70bdf4199a666829cf9c6c62c508d12afbe251 B 51f433d54a1d11eac25c32b0dd69f12fef62c060 B 5fbd407bac5af5e55bb280125405d75b7add872b B 6256b7c7c42bb01d2cc0d16d659ba1aa3042e7ae +B 66cc4a4e3c0e92d9e6931a5d416f11c2f07f268c B 67432aef1adb8e330c054431de9d0955e3993472 +B 69176e3dd7c69901d03f6d93bb365df784f06525 B 6e4f0f60785de1f5774644323edafb4741b9e4a4 B 71488c6fa7635c88285214a0479379aafef9ed3c B 75c69b27a7688dfac281d4acdcff3b0acc4c8bee B 7e318c4fbfae35680965082a491ca842a23ffd8c B 7e95279dd1170f5878687d7eea27f7d7f03a434b +B 80014cf0e6fb1ba62ffdb3766acffd2130eef9d6 +B 85c06fc4d6a642627434785a2d228d3c08d68768 B 87e146fd90e8f860eb7f2a8e99ad792e7fba175b B 88adfaf2ad97b4968b0dc47194b29c717b138d7a B 8e028a617f026fca2499f850bb680ada0692d681 @@ -36,20 +51,28 @@ B a4315cb442fa31960cbd47f11e95e81b4a71441d B a5f8a4dd4d9ecbfc1f8a1a8e5bcb4af17f561cc5 B a7b79ea692add4f9da0f1232e3bfb338099f4147 B b4536602d376a36bcbd02d21d5ab42f19d4e5b22 +B b5fc90f09c6b039a54564e0825a264310453c550 B b67537dbace0896073b55b375b8ccdc4cce83365 B ba8fc3d351121ec8eb2ce37cd12e014f722c741d B bb1edc5dd96c50ed2c3294f6834310e0a6d4381e B c044f726fae2a2f35ce5c6c3b9ebbfe54125ad11 +B d0c5c3defab6dbb9619f8fd291f2e06b685cb03c B d391d9371d8505c7774308c4fbbb9bc57ffd34a6 B d3e9295d3acfe3c970a325bbbafdba83a0d6e83c B d54a21628143bc15f51cbe5d63fa42c09d0ab8ac B e242307ad8bbe53788f3e03e9e2f0ca977d01340 B ea778c4f38f882dc97d23bd200683fd9d48b4718 +B eba07e615684e475772a7a2d23d7e93a0b099485 B ecbf4e78586870a507fe4cf91239d51c3f202aad +B eee2a947d867c403c212677cf942b3d07fa06fd7 +B f18acbcdfc48aca354610614c0ba3a46dcb8332a B f2f6aa016cdd1bb49698b319806a8369f149c8dd B f7a091afedbc7ca809a7205d7c053a1f5386865e B f942e1e15d6c4fa83e305eb7452dca8fc80cbdcf +B fa37d8722d154bbdec9d2acf4da16a04db0a34f1 +B fd3471e58e63ee672babc015ed0929f6cd6862dd B ff742436a3e177dc61106edf08f2509e727362dd +B ffd429be404953874e141c52a9c8ba46812d73ca M 18a3d43cb0044fcb84d3cc89f138fd9e7110dd04 M 43c8d500b04a13f72077751fdbfaab7bbcfbbf8f M 64368a5ddad507fa5d7016cbd07f3e9b5b5fd594
