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/85e82f6f Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/85e82f6f Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/85e82f6f Branch: refs/heads/3.0.x-fixes Commit: 85e82f6f7853b7f1b671295e9b10f97f96361b4a Parents: d4da4cf Author: Daniel Kulp <dk...@apache.org> Authored: Fri Jul 28 12:20:48 2017 -0400 Committer: Daniel Kulp <dk...@apache.org> Committed: Fri Jul 28 12:20:48 2017 -0400 ---------------------------------------------------------------------- .gitmergeinfo | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/85e82f6f/.gitmergeinfo ---------------------------------------------------------------------- diff --git a/.gitmergeinfo b/.gitmergeinfo index 91feef8..2df1093 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -61,12 +61,14 @@ B 091f3288acf848f82c3359c491298eee19867e7e B 091f8bef03e671f151e21a890159e5033b1c5d86 B 09355c667243314e64e2c54f8e21abb22f463d37 B 0947c0a206ae150e4985ff8c3ebf98fc048378bb +B 0967819eca78323b1f87bde6979ea9b8670e5de8 B 0985e79ab47124fbe0a08b9653ae7d4d1c2b5b97 B 09bfb64e25325deae5747c450d8d04327b604a35 B 09c7f359ed84a1df2cab07387b3ad135846df0db B 09d49660f13d36b848dbc979321d956c21f4b666 B 0a39148c8324e4772ecfa2607f663cb1ae835b2d B 0a6ff4cb91bbb950f66af9d95511ffcb5ee9d9fb +B 0a88d8665d61de10fa7553f4a410bfb31772ff5d B 0a8ce71c2adfe44ff9903a25ff0b3f758d5be7fc B 0aaa2b5742a53bf31704939e4bc21906100bbc54 B 0ab9416fda31298e485f2a6864c263447e4b32de @@ -159,6 +161,7 @@ B 162bbb5ea63cfeb6c258d750627c77c9e694f928 B 163e1d2361643251b31b6fdf7def0b52542577dd B 165ebbf9d0b5541b6abdd5c140cfe921d92cf869 B 1674e7fb3353fc9e5d2b81deb2d02617cc09a373 +B 16a275642f2621ce23772bacfd88a4bd93334e20 B 16d789c4a913e0cac51bcf929331abe84010ce1e B 16dd8a3eab9666ff42b91990b0bcc8b7708ed952 B 1700674150b8619c99ae02fdbd374b08d1855c29 @@ -359,6 +362,7 @@ B 2fc4aea17c98120c3715ef9babb19f58c0a79cad B 2fccfdcdbcd3a8bb8ea740eda499b48b74dbaf65 B 2fd8103535c1246a3a243e0fd7bcea86947e6b14 B 2fe88ec153b6193a8c80f7c1226db19600e0839a +B 3001234a9fa7e163726ddbe9d87233b9da992868 B 30119990866f5da50d5261653a1843c618cd6459 B 3019c331c0f069ed63611b5263df3ee4d427e4a7 B 304ee04631e07040519f32ece1e44a79e784dff8 @@ -396,6 +400,7 @@ B 3506302369c0a28647056c1da469bd9844e45826 B 350b51632f4c5dbd4891636261909c73136981c6 B 3510e3d345ba2186a228436d481c809e692d42a2 B 354ac95b70a98b4f2e8f9f33c534b3e885e9a935 +B 355a5e9999589b33a765c877239b204e3081172a B 355ad864fef9f17d53b5c7ccf1aaa96ae24ec4d1 B 358589c33f44d747f5a924f0b1cdedfcb7018a22 B 35ae5ea6c77428e5e6f203a6a3c85fe2414498d0 @@ -471,6 +476,7 @@ B 3f90fa6a7adb9c3311663424950fa352d7d5bdbb B 3fd465a1b74c19e819a794ff89227af2c0d268f5 B 402e89f5fdf5ef07cbee449912fd920c727c1886 B 40356fc6b033def4adf817453a483939a249e85d +B 408ffdd9c20d6d22dd8d390053726b18af431903 B 40b19d7f6f1877f6c2c397548a4e24582c053706 B 40c9bfd5ee0ba7cccd7abc7e7d19db531e212c97 B 40e31a9f14bb9e494c9240463e17ed232e201876 @@ -539,6 +545,7 @@ B 47839c649a92a4e372eee313e5d53ec5c91df334 B 478de215af2da2c03f439bbbd8341b234bb7bee8 B 47b1a4ae21cfc70cea3b48ebd2be72fd184f1370 B 47d32e6333429a4809f5dedc7d39b4d884b21f28 +B 47f0d90a3688c0888039d49bb85a367c54af5b3f B 4800bc8de7d7626fab25d8ab775e3da1ecec5007 B 480332043150dcc96843c3eb7c7c660118bfaf74 B 481466c7a42a57c87c992a02ab560be046bf5797 @@ -645,6 +652,7 @@ B 55829d69db9c132f72eab41baff6b6da6d1869e5 B 558c0ffe3a433fc895c9db8fdd6ae1a6cd71949a B 55adad16d0172531fabb0dea3e527d7a152596e5 B 55bda33699ea1c2e84a125253edd594cc2a32ea3 +B 55c2f0e9f1c53501ab7078c2d0b9adaa3d67f1ab B 55c72f2257e9afaacfcd9de8fe0635ea0de6d786 B 55e9924dd0694f09ef8b3343b566699dfd2f266f B 55f92f4c2c750f13e231482466181eb4bcfdcc74 @@ -767,6 +775,7 @@ B 6727419f6d2fe6cf4b91940dc05b972f58d38da6 B 67432aef1adb8e330c054431de9d0955e3993472 B 67755ea99b1baf4c567196ac6f1e00d342d38132 B 677d43af382f491af4c3ef8205e5570fb9f87734 +B 67bc32587210b9823798bdcab5ebdcc93a2a14f8 B 6819cc59fe842ce3cef4e148c0f6f94db6931c4a B 6899a37bcd3ed2f9e1b7e47100ecd2dfdb569479 B 68a567632a063c6f9bb27a73c151d21f6e855f50 @@ -865,6 +874,7 @@ B 736e7d464e3a6261ecfc041709924b7effc00cce B 73cce96fa123c8a4245269157692fb6f596dfc9b B 73dcc6d8894757341151414dae981ce23b034945 B 73f8c955d8f593928b1f00586043e14daf5d5242 +B 740a762ed1a0528ad36c443f5c897f7fd6f4c747 B 741a74e33bc29f7ada4f5f908ec4fcbee55dc011 B 742c38c4511d5f9794e6ef62fd449ca26bb108a9 B 742cb68a9172c968aeea5ece7146f9c3dfacde9a @@ -913,6 +923,7 @@ B 7b4c14f1aadb810d5b91fa0adfa2a6bc70e45a76 B 7b8145e65e9300931aea628251446e49f2e8bfe0 B 7b9f72bd7c3dc778da9bee85d54f36f99c0feb23 B 7be9bae496416baf3dea6b35d4fe8aef7767c7a6 +B 7bfb4fd35c42acf6a02e9c8bd622b0cf9bf0a1c1 B 7c159a7916bb839726847e67ea87b00707b5f897 B 7c3ce3d499651177e9e712d49c7774c5796b1524 B 7c7404970a05900911b97c28a08665f5db3dcaa8 @@ -1070,6 +1081,7 @@ B 9135ee4d2820042847ab798b0886cee633088050 B 916dbc7e5fd06e2c188775d29c950af8e411be11 B 919d84dd4e2c0bb5dd7e0de9e7d176c191b06029 B 919f6d27083999af2f109cbfbc3f38a0e19177ef +B 91a5375ab63181521f36cda127de8baec7f620b7 B 91c7b09005e8d32187283828ac348235b725e3e3 B 91d6630c53f222544e4bb512fb5c918d68518138 B 922ec5d244f632c57ac5c3e6a3322c9d1a0abde1 @@ -1131,6 +1143,7 @@ B 9ae69b3b323f48de033f62be9fc2780f11b0c761 B 9b1b6cb2c15a6b4bcbbc14a9927ca35bf711a121 B 9b3b93b64254409dcb538ce92556e2f0d3848a0f B 9b93ca4bda4ba8abce2e2248059f2ccfd35391b2 +B 9bbf7417eb6841a4518920876bd5b7dc6692609f B 9bd52f477b0063dfd06b98eeb59c19c5732be1d4 B 9c4239c88829e7555cd7b9e35b608bbc50a77e27 B 9c53709b39163bb2962990e88b50ba8961d8dc85 @@ -1276,6 +1289,7 @@ B ad5763ef8ea1ff3c8ddea2c3a6fabdaae6acddd6 B ad577419dd39b1414080e6b34ed75db64254a150 B ad700a5f6471f55680821f6d04b182f5d3a6054e B ad7a7ba7da2a43c9646d04be24bb4c5516aee981 +B ad8d7467279ca94f27af72a873c05a4ee42d12c4 B adb0ce53862e37ccd2f16029c7b13b4fa0cb0ac9 B add75860c8328c205cee3a4fb8848bea717fd8d7 B addf51d4c6edbbf457d25a1c555f9b2eedf235f1 @@ -1285,6 +1299,7 @@ B ae1d427f61362cd56596f9fa2d1ff0000ee64861 B ae27ee6a3fab19a817c62ff391a7ae23216dc16e B ae6fbfb0e60bc2c017ca5b416c3291040434cb5e B af100a919178b0938fcc04d9c8d1dd1269e351b9 +B af13152a74a53e115ee06a8bf1e5b2243a9543ed B afd70f562f769c1f1ed26a275cbb3763b24cba43 B afeb2ab056a4a4377db11d597c675108eb780d16 B b0097f19641e9c42837e87e98d37415026087640 @@ -1335,6 +1350,7 @@ B b48c79cc187d16a81e45be8a24e56437a0df56e3 B b4a17ce9970cd124cec61eaed04061a529e2398f B b4a1e352028e992ce6ff8f71666467ea4f96d7f8 B b4bfa886ee80b681b09eb578c69a03a43ea964e2 +B b4c3fa08369dec06af367879c9ddcc693ed87d8e B b4e7dffbaeae4fdf1a20d70cef51e2e44e8960bc B b510792d63c135c2392bd10ac68f1bee7f21edb0 B b52157a330d9ef4daab8d2826579cb68ca171c69 @@ -1531,6 +1547,7 @@ B d021b9041e00518099947274455b2027326a3c7c B d04ba0797f41bc6fc0a44821c775f9458957f37c B d04f83cecea57d92052f3bf1f4eea7f4adfac6c6 B d0c5c3defab6dbb9619f8fd291f2e06b685cb03c +B d0df127c3fdd90349f47e6aecae30156989f5482 B d0e42861b5df45cf24985d956372f75bf04800f3 B d0fb61f798561c4e24e283672e317e7eaaec0ede B d1687e70dc8b0e8571cc7dfebbd173ec1ccb1c32 @@ -1554,6 +1571,7 @@ B d3baa23e3cbac2364498f81ab293aeb61902caa7 B d3e9295d3acfe3c970a325bbbafdba83a0d6e83c B d3ea067659eb3f765df0bee6ce7b4abb55f76ab5 B d3f9087516e7179a356bae8b8fb642ce6a89c3b6 +B d3fbe7243e2743db82b0b689c59002d72fa1b81d B d3fc22efa8153a1edc1880c05ede6d44208fa03a B d49f8c16877e54d6b0cbf383acd2953894e3325d B d4a25bbea9911b8c2debfab6724a3cc95532c4af @@ -1595,6 +1613,7 @@ B d877c0539fd09d79094763b98484576de52198fa B d8a6bdbd2c84b3fa0187de935e294d5f66974e46 B d8a6e85e7de8f01f08462a683e9c9f1aaabff908 B d913cdf45b2d54136f05c4870ed643fe0b542026 +B d91b5593e19c07e7aafa479a089c0099db7afc6b B d9ddf02246f49511d29cda8e6458e5d28c4f861d B d9f624e2eca8affa20243583ace087a8cbba3ac8 B da40221a626a1df88dc1260fa8e58b869bb99cf0 @@ -1672,6 +1691,7 @@ B e3cf81814730be1b2a1b35a7a5d62ac4da061ab8 B e3edee617edfef541385cd0043ca88ab2e6456d7 B e41d2352762c124401629d7295691de2b6db1d5c B e4278ceea39da799656051882b683e31fbbb4be1 +B e43a31162931fb1993a3f18b1bb560597ce1a926 B e441a15af9413bfb24ee1b4ce78e01bf543fc148 B e4858d27b356f577eb31908dd43817681f007a4b B e490f5c8f792a0d35829eaac392fdd1fd74a782e @@ -1760,6 +1780,7 @@ B f18acbcdfc48aca354610614c0ba3a46dcb8332a B f26c82ef6ef82f3971e3019f9f43ec9e9685427a B f2bd28eb34812b6d08c3cfd4b9b38ba24be0716f B f2c370690d62cbb9350aa3447ee1ab8336335074 +B f2ca294d88c3d61265a1513452144670e7b997e7 B f2f6aa016cdd1bb49698b319806a8369f149c8dd B f3185100ec7caea0ac4b52108210ed7e68e85271 B f3207adb13cbc93b578519e7ef8612fedfcc4634 @@ -1777,6 +1798,7 @@ B f5655d81ea6a880cf6b8b1cdcabddf1cd4dbe869 B f56aa148e9e54d6f9a2642d7c2160cff13e0231e B f573af6e8abe03e5dbe7944c97508f46cf4a3de6 B f595ca026d56ec5e58a38780677598d8f9d9ded5 +B f5b010990de021fb1084a2b4e164266b9ce0e5c6 B f5b75c7a061b04a75c12fda170d5caff89c257e1 B f5b83ad364b11bca9c4d3e70bcc68951e096f8ed B f6293b0cbfd682a17d0f9549622cace14c68287a @@ -1799,6 +1821,7 @@ B f7a64ca9f12fa2523c35bc5add4be3e979a7604f B f7c91cac615d7d46b64a7c2b5c1bb6dc515e2e8d B f7c9fe2f9e3f3ca12b426903be3a1e36e74f9c20 B f7db188bb0da238dac2e7714285d5ae3463d6428 +B f7df387f599b9f01e31ea2dc19dba843868640c0 B f8169bd4e2d8761ee2e463d5e0d59dc4138a2a79 B f823ad0f878ebca2e35e52240851246302dbab26 B f831e9f5ee56bff9e4472782300f9558ba234f80 @@ -1859,6 +1882,7 @@ B fec88085f5f97eb5b6b0bb3d5ceee7af1509876a B fecf633ce099ed1cfe3bc32fe39c239d6903a550 B fedfefea62fb5d852e2310f7ca6594a7e6e3b41a B ff4fd0c01aaf8ef1cbdb8707eb50a54d762d640b +B ff59c74044b984fd4f3de5006c7a2775d8312d59 B ff693a62de7674464fe28265c48ca07dcdb64026 B ff742436a3e177dc61106edf08f2509e727362dd B ff8260927ee55a38a477b4206ec41c16bdb8015d @@ -2158,6 +2182,7 @@ M b3bf20abb23f186dbdb0e16519d5c02bbaf5a3ce M b3c1804ba33e0c2c7d991b585ba8147eb13ee07b M b4aa01a0de28462f7338d232e2e88be8512882af M b5320827561467de7e04afdba15a6063d26493a3 +M b5d13929e3a068cb009f10cb15ac3d05c3b72f67 M b72e2b560bcfd565946b185a9f123de0cbc2d995 M b7d33366f3311dc33c7da389f98fced6fd470c93 M b86ac6d0d12c25ca8a50e8e4fcc494db258387f1 @@ -2238,6 +2263,7 @@ M e51a7bd7f3dcc120dbeeebb3e5c306941af64554 M e5a805853864e291626bdb913448fc4e2409cca0 M e617a2c5865cf3d11d0d344a23dc2d493ff4809b M e681dda5bfd7d68ebf340a459ecf612e8a926290 +M e70b0043c8ca2ef9edb00a5af682ec3604c82bb8 M e72901565c3af9c32ad7c675b3dc92e25c226704 M e7d7190b89ecf2ab9bd100ede621ebd6a2808dcd M e80d3da7612db41f7efe9c5d3128965ec7d2809b
