Repository: cxf Updated Branches: refs/heads/3.0.x-fixes b3ccbb9a0 -> d4c3089c5
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/d4c3089c Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/d4c3089c Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/d4c3089c Branch: refs/heads/3.0.x-fixes Commit: d4c3089c5921f11092a6380f1441988a47830a25 Parents: 894a1b1 Author: Daniel Kulp <dk...@apache.org> Authored: Tue Dec 15 16:24:01 2015 -0500 Committer: Daniel Kulp <dk...@apache.org> Committed: Tue Dec 15 16:24:01 2015 -0500 ---------------------------------------------------------------------- .gitmergeinfo | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/d4c3089c/.gitmergeinfo ---------------------------------------------------------------------- diff --git a/.gitmergeinfo b/.gitmergeinfo index 4064cc2..4d4310c 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -4,6 +4,7 @@ B 004321a2e955665005b9c5bfe304feaf9cb622b0 B 005ee936d42897f7083fd9fe26addec4779d4764 B 013eb89d0453bf897d219b762e50ab5232f6ca00 B 015419bf394e219cbb07ca7706b4bd8e2942e856 +B 033815a0e180b8e1abfcc0c1acdbeb0219ad256d B 035154fb466fb9c833804d1bc747804df9e9992b B 03bd1b4f0beaddf4df112f7c08d5749862805dfa B 03d63bca6fd9497ddeba1a0657929150d02827d2 @@ -36,11 +37,13 @@ B 131c3fdba9c4825b739adc3d149d0297175b8a86 B 13b9b012a31fdf1a7e35757a336fecc3c688848e B 13dfe0f9fcaa0aee4c603072436d85861a0ab734 B 13e01e23ea87ea5b06953f18bef4b173fca55b4d +B 1444405de684d0a266cbbfbb415e09121412d577 B 1487fccd43c3bcc463f12cdc1573cde68323f8b6 B 159089a4c0bcf4d30ed819f064f0e31c6c3dc2af B 161e10bb2d87573974b8a1748f023c47ebbe5d49 B 162bbb5ea63cfeb6c258d750627c77c9e694f928 B 1674e7fb3353fc9e5d2b81deb2d02617cc09a373 +B 16d789c4a913e0cac51bcf929331abe84010ce1e B 17d710cdb3b4d3cd5d07321051ac42753c4817b2 B 1805027c9ce9925fb875e92fc5314aa826632151 B 18204e5bb0173ccea83c0afd10e4450f370287a0 @@ -80,6 +83,7 @@ B 28a4e2ea5a35247cc50a2013371bcc178ff1d390 B 28e185b27e8c80cd773cac46d1b9b19529c4fab0 B 28e8f04af96d3e353f0da5018a4531d45592c663 B 292fe2541e32bb31a59955975972cd6adfa1a9dc +B 29a9b9e96582602565286099ac3965424372370d B 29f0620a9a025afcd2057cdf97c7d93caf6c179f B 2a2ed67576b525f9708fcb8bd9e8387a277a1f4f B 2a5d201be1b85344585094d0f044e9bf1b605fac @@ -91,6 +95,8 @@ B 2d3592e667e0ed5c2345b8fe1ae248a6b0fb1b43 B 2d41042ebc1ee81b61aad4b08938c1c73626b968 B 2d7e7939c5a0e27eae861ea58aba598ba95c5f41 B 2e19b7549462aa8aafc9df7684327375fd4cd673 +B 2e221ea50c22d528b6b23dd0c0f0cc862e2d0fa4 +B 2ec875978a50cd34d07bd7d3bbfc8583fd30250b B 2f0b3e38212674883d610cfcfbd76b901bd3d997 B 2f164ec218a1e850d8cc4a6a9ffdb6dba248895f B 2fd8103535c1246a3a243e0fd7bcea86947e6b14 @@ -100,6 +106,7 @@ B 3051c2a54adc909be8d63c690b1444eb2f9e5e35 B 30853113b4c4d47200bcf5305e5e88735f32cc8f B 315e357e850407e9f3233259bab33ea765633271 B 321b2f8b66bf6b9d1fa68aba086c8cddf18070e3 +B 3240a6a27e48f41e15ab75ed2c1735a1f5056668 B 33083c0682d2bdf2f42df7f4021d18bd7ccc34a4 B 3309231e467225b18b24d90d77153a0c572a17e0 B 33c7781f4f847431a7bbdc9335657d3281cd525e @@ -140,6 +147,7 @@ B 43babb8fc1bfd034657eb44fe82fab960034c85d B 43c65b07658b8041f6689d16a34ff98132b8a424 B 441cd2cecdd8a88d42e41324643f06a2fccf5a25 B 449a10ca63d5b3507861eb4da9f56c215eddccfb +B 44a2a45027c51d005a725ad95ca8a57288e29e49 B 44d7b57b7cbab26767eb3e485674210214d87673 B 44ddee3a98918261f18699b895295b53785bb9a7 B 450e3ff7725e1d9fa51ad2aa01d927343e9520da @@ -238,6 +246,7 @@ B 6a9b6a5ebae8a1810374457eca74d09005a920cc B 6aa73265ae179bb4ebc3d826c1661ecab387067b B 6bdc9257b691e140f435a567e0b4f566c71be6cf B 6c58f0c8861c9e9a922d337da4ea8282c75255c1 +B 6c67f878e2c210e7f03c4aea52b2ba2eec7d611a B 6c9fb62220345bce0b19561d95b38d5507f75e71 B 6d44bab6a03832c3fb73b57ae68edc5bda2029ea B 6d637dcb21bb4a17b9c581748e85bf5a82f6c9f8 @@ -290,6 +299,7 @@ B 7fbbd1d13bbb7ccbbc1213ed86a456794583fd3e B 7fdc34030bdcfaa4226c28ea8ce83f34563a5b6d B 80014cf0e6fb1ba62ffdb3766acffd2130eef9d6 B 8075975a5ceddbdb610677e485fec5717af2cff6 +B 80a1247de3735319858d0a24792b2647256f78ac B 80d7128a3ba1944a603c73e5e908d86c9bf27648 B 8176b1b0faad2de44a4ff85083c74b5a4b74918a B 817727ddca9aad39a66f7001bf5f1c959dc7f581 @@ -360,11 +370,14 @@ B a04a1e06f7fffc5f145e33c6832f31b04782516b B a0f0667ad6ef136ed32707d361732617bc152c2e B a1487f2cd460028608a693ee6136d62803a633c6 B a16abff276542979aef91f7e56cd8e67a695db14 +B a1bd8bd7f0f3877c63c9491fe4c423f43bc58720 +B a2398cad82a549f9068351baf8185f2a1da4bcb4 B a2855695896d5084ea288b0fa47457e4b7bfac38 B a293c4db64e0136011afea865eac646f4129ce60 B a2e1e40d3c185f53741c937e7b861bab2808d70f B a2e5fae3a093965b75361210ef475abb9e6abf56 B a3347f0378b49b6db6ca6ec274098f4b52fd17cd +B a3e1065d4c2a600f63585a6c892e636f5740cf73 B a4222c930f7d69608f826c14e4bc7bc9f670097c B a4315cb442fa31960cbd47f11e95e81b4a71441d B a493fc41c1bdd5d282dac7fec57db9d01987af21 @@ -403,6 +416,7 @@ B b1f19a1962d3791211ce83038e8641598c6f5ccf B b248d091551456c2fa8cfe0530dfdfc3632fe5e4 B b297eed6d676eb0e5ee3fa4f597d04e1fb9652ed B b2b0c2af76a5aa77ad5103a3c94afad856e3bbe6 +B b3c5afdbb8b7f78a23392bc3c751664a82fbe8bd B b4536602d376a36bcbd02d21d5ab42f19d4e5b22 B b4872363fda49f205001d4385ecbc35133c2c755 B b48c79cc187d16a81e45be8a24e56437a0df56e3 @@ -440,6 +454,7 @@ B c0526a6e55a1eef931bc9257cdd419b64818ea41 B c129ebc7306e29c6010cc544ce4b8e723dbbd504 B c1c9562bb13eeacdd9dae5a46c513e9e03625698 B c2b70fd462955b714f0211ff52e1f99399666d44 +B c4c03e06de3ec8eb8b3e3b35a8c27d1615fd5931 B c4c969042edcbcd439faa0fc95c1f5130cf06c71 B c4ce1dd672146fa49f7d6b0aabc563843828fe93 B c5609a479c87ea75e016b61daeafe0021f693332 @@ -465,6 +480,7 @@ B d0c5c3defab6dbb9619f8fd291f2e06b685cb03c B d1c7f1f6be4ce14bd0e99ec9672d9c1957515f35 B d391d9371d8505c7774308c4fbbb9bc57ffd34a6 B d3e9295d3acfe3c970a325bbbafdba83a0d6e83c +B d3ea067659eb3f765df0bee6ce7b4abb55f76ab5 B d3fc22efa8153a1edc1880c05ede6d44208fa03a B d4de0ced8b53599229a7a3e43ad3bb5cf70b401b B d4f9674baa811936429271cbf64c4a558282c764 @@ -484,6 +500,7 @@ B db18a965fb238b8515ab74eb63d13c863c279476 B db51e1a99ab886f179c677579ba798b450069287 B dbf8d58d565ba7f3a8c43b917f7e9182cabe5efa B dc6fe383b095c6823e5de707b1c091556c9c378a +B dd3c8f9d05b549d7aeb3804476bdc3fb344cf2d8 B dd8025a1695ac207e8b28e3cff38bb7df6369361 B de88ed19bd937440fa891a852582a2d9ea971e3b B df947cb1ca2b9e375f99e199ec65b1afece1c963 @@ -525,6 +542,7 @@ B ed0f25116f8620841ff96dd1b751d97c11eb09c3 B ed18c008f05af7063d5929d072b86048d12dab4c B ee64acf5f8370cd1e33719e4d9d4e9922e386602 B eee2a947d867c403c212677cf942b3d07fa06fd7 +B efac3c9e56559370e2d8c8733f7886f83662b4e4 B effcaf3f6cfb4b3287d683285592f2693af42b29 B f0200ef2cc049726798ce53b11bd61d4cb33d45a B f18acbcdfc48aca354610614c0ba3a46dcb8332a @@ -535,6 +553,7 @@ B f4aafc6f8fe4e4964f6a48a50c43ceee3a171a64 B f51fb332753e9600a6b6e6dd17b42c1a1494395a B f5655d81ea6a880cf6b8b1cdcabddf1cd4dbe869 B f595ca026d56ec5e58a38780677598d8f9d9ded5 +B f68a90ad7d8339395db1ab7a8ac551544bb9570e B f68d734e375174773fd411804d12b04fef2bc011 B f6c56d93132c81392d52a42caf9d1326c342150f B f71738d894d4143ed57b956ef1dd68aec5b1b41d @@ -543,6 +562,7 @@ B f7a091afedbc7ca809a7205d7c053a1f5386865e B f7a64ca9f12fa2523c35bc5add4be3e979a7604f B f7c91cac615d7d46b64a7c2b5c1bb6dc515e2e8d B f823ad0f878ebca2e35e52240851246302dbab26 +B f831e9f5ee56bff9e4472782300f9558ba234f80 B f859eade61005a93f4954b9763b0217e7bf3b15d B f8df21ed3d17539a81c9cdfdc4222d13ffbe62cd B f942e1e15d6c4fa83e305eb7452dca8fc80cbdcf
