Repository: cxf Updated Branches: refs/heads/3.0.x-fixes 537ea185b -> e0ff63e15
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/be4a46a9 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/be4a46a9 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/be4a46a9 Branch: refs/heads/3.0.x-fixes Commit: be4a46a90f90840fdb55b3139f5074970e2a6169 Parents: 537ea18 Author: Daniel Kulp <dk...@apache.org> Authored: Tue Dec 2 16:38:53 2014 -0500 Committer: Daniel Kulp <dk...@apache.org> Committed: Tue Dec 2 16:38:53 2014 -0500 ---------------------------------------------------------------------- .gitmergeinfo | 11 +++++++++++ 1 file changed, 11 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/be4a46a9/.gitmergeinfo ---------------------------------------------------------------------- diff --git a/.gitmergeinfo b/.gitmergeinfo index a0c70b0..06fe915 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -17,12 +17,14 @@ B 1824d9cae26c3b141d873d0d01036602ac339c37 B 1b3f01b4f640beea1f1247416ad9891e615f816c B 1d29dfaa8e686570c1b2ec2da4c31ba380e0b9b0 B 1e927cdfaafb2efc8d29184cb5b7b05ce3c3ad7f +B 1f02b3d4f2c9d341046ce35222c8f4d7674b10b2 B 2004b1021ce0d0975eb49cae36416863bd8c59bb B 222137cb2ee577e6582a644b7ae73bbc0a75d4d1 B 2afb9d3cacb299bea854d1ff4824e4c981a41d6a B 2ba77327488a8446e6a92af137f644eaf3b06e2e B 2f0b3e38212674883d610cfcfbd76b901bd3d997 B 350b51632f4c5dbd4891636261909c73136981c6 +B 36fcf426a4946f57b051ce7a388c7190fc97aebd B 384ad75433037358ea1607c4ddcb0cd978fae10c B 388d6eaf045c0215c7cffc891526a402c70625ec B 38bb9fea460262ff2781cbfdf85032d3f4fb9fe1 @@ -55,6 +57,7 @@ B 6e4f0f60785de1f5774644323edafb4741b9e4a4 B 6efe475ad57f042ffc9547f1bb258ab4e16a3f3e B 702f27bc4a334b2d117262252632bf580f20f711 B 71488c6fa7635c88285214a0479379aafef9ed3c +B 74a2e6f2b1d9787cc9b5cff4cc84e43cfccbfe94 B 75c69b27a7688dfac281d4acdcff3b0acc4c8bee B 7d1f30f76d95f9eddf0bed995120c71bf1a393b3 B 7e318c4fbfae35680965082a491ca842a23ffd8c @@ -77,6 +80,7 @@ B 9344b093b8081a68c9f83f0c740d60508e99fd5e B 944eb0ba1043bd4daf9cf087b66bc9cab10b8ff2 B 9896b920035a1d1be1aef28a1d1a5eb876445c82 B 99963f9a08c9782b7c661f2b5ff8e9ce95ab3dbe +B 9dfb278c7739b9f4621f43b8146d057e21fafb64 B 9ea935fcbf3869f5fa4fd1e75a0a2309cc780415 B 9fe4c04a1c875b3e8f402268cd9dfe18431b5cc9 B a2855695896d5084ea288b0fa47457e4b7bfac38 @@ -86,6 +90,7 @@ B a5aff3e7a43274b3d47cda706aaf8108bd7a9b07 B a5f8a4dd4d9ecbfc1f8a1a8e5bcb4af17f561cc5 B a7b79ea692add4f9da0f1232e3bfb338099f4147 B a7c6e78b491c4feb6797a6dddd32a6249189a552 +B ab4eaac0be87291b7f053d144dc8fbf9d98634c3 B b4536602d376a36bcbd02d21d5ab42f19d4e5b22 B b54fe0dfdf3c3d76df1e07fb3686d5d8a1061d48 B b5fc90f09c6b039a54564e0825a264310453c550 @@ -94,8 +99,10 @@ B ba8fc3d351121ec8eb2ce37cd12e014f722c741d B bb1edc5dd96c50ed2c3294f6834310e0a6d4381e B bcf0c9f825a7b8d1c86405403d7c089fea2955c0 B bea22d764138e365513856c23be760a7719530a0 +B bf6bba1082d030298df9b9f1c354da5f92833eae B c044f726fae2a2f35ce5c6c3b9ebbfe54125ad11 B c1c9562bb13eeacdd9dae5a46c513e9e03625698 +B c5609a479c87ea75e016b61daeafe0021f693332 B cd809b8526fc5620c481d4ee5a8534ccf6babae4 B d0c5c3defab6dbb9619f8fd291f2e06b685cb03c B d391d9371d8505c7774308c4fbbb9bc57ffd34a6 @@ -112,6 +119,7 @@ B eee2a947d867c403c212677cf942b3d07fa06fd7 B effcaf3f6cfb4b3287d683285592f2693af42b29 B f18acbcdfc48aca354610614c0ba3a46dcb8332a B f2f6aa016cdd1bb49698b319806a8369f149c8dd +B f51fb332753e9600a6b6e6dd17b42c1a1494395a B f595ca026d56ec5e58a38780677598d8f9d9ded5 B f7a091afedbc7ca809a7205d7c053a1f5386865e B f942e1e15d6c4fa83e305eb7452dca8fc80cbdcf @@ -130,6 +138,7 @@ M 2b4fe9966c46457177f6412525c57c64d07dbe69 M 2d3ac551c8614516cbbf288195d2a99cadb79659 M 43c8d500b04a13f72077751fdbfaab7bbcfbbf8f M 4640cf1ea20eee09ae650b706bce765a16affc8b +M 4715a0ddce4864bbf6e1c34a7a1cd9508a52d9cd M 47b57d723f1468e9d9650617a6013edf4f965900 M 4915ce370e5f1905f77ebecc8883cc86fcc3e4f4 M 4a292c0cc49c0c4eef5d50efc78a499c7a5e1783 @@ -142,6 +151,7 @@ M 6292346fb110f0517b791f91d03fd2515d575388 M 64368a5ddad507fa5d7016cbd07f3e9b5b5fd594 M 67201fdde69488e511deb3d24794984afc01fe2d M 7431af236a19b5b5f899bad317a548a4c5c9cd49 +M 79156d8a23497b9ed9bd912b64f684e610d49863 M 816e1a5ef4c0992a7d084a0529e42d9ad6a4a3c6 M 865eb64d44fd4e904f166cb03b0d15ca8b5f0ba5 M 89b87071f3dedd2cd5ed874e56f69ab7dcf7953d @@ -159,5 +169,6 @@ M c55664128b1223667dedacc2011ccd5945d9c8b9 M d2dec5b87788b8cb5059d3719cf3dfd7135a1280 M e2ad037fbc74f42655ac968415fcb4bded87bb38 M eb3dd938052b3e853b0cf85dacf31ef7f802af38 +M efaf05170b4f76ad61ff423e30ece58bdd226ae5 M f02b02934bf78504ffc462c364dc43e386e727b2 M fb0520525f07041f42bc0562b4a15240bb757373
