Repository: cxf Updated Branches: refs/heads/3.0.x-fixes aaa555d55 -> 55600a7c2
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/55600a7c Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/55600a7c Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/55600a7c Branch: refs/heads/3.0.x-fixes Commit: 55600a7c223c6448c75e6491d5f35e9c80f24845 Parents: aaa555d Author: Colm O hEigeartaigh <[email protected]> Authored: Tue Apr 7 10:11:07 2015 +0100 Committer: Colm O hEigeartaigh <[email protected]> Committed: Tue Apr 7 10:11:07 2015 +0100 ---------------------------------------------------------------------- .gitmergeinfo | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/55600a7c/.gitmergeinfo ---------------------------------------------------------------------- diff --git a/.gitmergeinfo b/.gitmergeinfo index d571d16..d023cac 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -32,6 +32,7 @@ B 2004b1021ce0d0975eb49cae36416863bd8c59bb B 222137cb2ee577e6582a644b7ae73bbc0a75d4d1 B 2426a0879b06cf6dea32004af16f96f793d568eb B 24e330c8b6be65c98cd3914f6fe7498e980f4568 +B 2616fd04151e5bb7b8a31428f8a9fd0c957dfb48 B 27c2c25dc3c2c3019543e31afdca7b166911f278 B 28e185b27e8c80cd773cac46d1b9b19529c4fab0 B 29f0620a9a025afcd2057cdf97c7d93caf6c179f @@ -40,8 +41,11 @@ B 2ba77327488a8446e6a92af137f644eaf3b06e2e B 2cb99eed19d1a8f097c4ae54967c6e45a7c03d67 B 2cfa9011aaada9fe68bd0d9aad7ec86991ede43c B 2f0b3e38212674883d610cfcfbd76b901bd3d997 +B 2f164ec218a1e850d8cc4a6a9ffdb6dba248895f B 30853113b4c4d47200bcf5305e5e88735f32cc8f B 33083c0682d2bdf2f42df7f4021d18bd7ccc34a4 +B 33c7781f4f847431a7bbdc9335657d3281cd525e +B 3506302369c0a28647056c1da469bd9844e45826 B 350b51632f4c5dbd4891636261909c73136981c6 B 36fcf426a4946f57b051ce7a388c7190fc97aebd B 3834ba2ea50a164cf2b5ffe15229dcf512e110c6 @@ -50,6 +54,7 @@ B 388d6eaf045c0215c7cffc891526a402c70625ec B 38bb9fea460262ff2781cbfdf85032d3f4fb9fe1 B 3aec3e286e4732918589c239ea1b8f7e1d3a9836 B 3b1a8cc3a8c1b213a8f6728ae9154cf14c9c1300 +B 40c9bfd5ee0ba7cccd7abc7e7d19db531e212c97 B 42eba2f948a967d62dc0257a920715ae47ae4310 B 431db5275e3a056d6cedf4608533197580cb6073 B 43aa455461fb8a33b0e5844512b263a262c2420c @@ -62,6 +67,7 @@ B 470bdcb40597dce5e5cf957000ab60b0b4c1fce4 B 478de215af2da2c03f439bbbd8341b234bb7bee8 B 47b1a4ae21cfc70cea3b48ebd2be72fd184f1370 B 481466c7a42a57c87c992a02ab560be046bf5797 +B 494ff7640d78b1667547c8aacfc1d517fff00ef8 B 49c35937c3a0813ed4ccf34dd03fd5fa2f41b86c B 4b44512d8c3fe76620dbac37d220038435c75ba5 B 4b4a5151c83113bb53d65e0304b8c9fee524d28a @@ -77,6 +83,7 @@ B 5b26ab08f19f6c55a45c0f1f7ddccd09b0a2ed23 B 5bac26a132e7999bf0bd108d4cffb674873a56ca B 5c678face89e4d38b2879bc4679ce3b92ac3aeb0 B 5e06ba0c4970700477484bd2409a226aa9ec7f0a +B 5f94e273e7e8d99915eeda1189824f13488eb013 B 5fbd407bac5af5e55bb280125405d75b7add872b B 5fc6229a6d289a6a4f23fac4f1d7750285c85d1a B 6168d90fab71f2a8811640bfbbf88bfd1eed1848 @@ -90,6 +97,7 @@ B 67432aef1adb8e330c054431de9d0955e3993472 B 68a567632a063c6f9bb27a73c151d21f6e855f50 B 69176e3dd7c69901d03f6d93bb365df784f06525 B 698cd0483b99f9638ce05557e1137ffce86d4185 +B 6d637dcb21bb4a17b9c581748e85bf5a82f6c9f8 B 6e4f0f60785de1f5774644323edafb4741b9e4a4 B 6efe475ad57f042ffc9547f1bb258ab4e16a3f3e B 702f27bc4a334b2d117262252632bf580f20f711 @@ -98,6 +106,7 @@ B 716531d62eaa8b1dde566e59e2a5ff0be1b2b33c B 71ced4709dedf62264a4bb630aaf4780cb94ce48 B 7456089088a21620ec75dc83fbb4b89ebdfd290e B 74a2e6f2b1d9787cc9b5cff4cc84e43cfccbfe94 +B 74aea1227832d3000f2f9fe61d7cc3bcb8a60a79 B 75c69b27a7688dfac281d4acdcff3b0acc4c8bee B 7737225402d3a7b2e669ee8ecf54de10af686f20 B 799c5389f754eb588f023b646b8983b50dde00be @@ -135,9 +144,11 @@ B 99963f9a08c9782b7c661f2b5ff8e9ce95ab3dbe B 9ae69b3b323f48de033f62be9fc2780f11b0c761 B 9b93ca4bda4ba8abce2e2248059f2ccfd35391b2 B 9dd4194ce6af00377b0e1bdc6b15744fe03e29c9 +B 9de88cce894ca9ea746abf27943635467e23c153 B 9dfb278c7739b9f4621f43b8146d057e21fafb64 B 9ea935fcbf3869f5fa4fd1e75a0a2309cc780415 B 9fe4c04a1c875b3e8f402268cd9dfe18431b5cc9 +B a16abff276542979aef91f7e56cd8e67a695db14 B a2855695896d5084ea288b0fa47457e4b7bfac38 B a2e1e40d3c185f53741c937e7b861bab2808d70f B a2e5fae3a093965b75361210ef475abb9e6abf56 @@ -150,7 +161,9 @@ B a7b79ea692add4f9da0f1232e3bfb338099f4147 B a7c6e78b491c4feb6797a6dddd32a6249189a552 B ab4eaac0be87291b7f053d144dc8fbf9d98634c3 B ad5763ef8ea1ff3c8ddea2c3a6fabdaae6acddd6 +B afeb2ab056a4a4377db11d597c675108eb780d16 B b18a2bad64c343520795175cf377cdf1b981da2a +B b1b3fc2e1b4a0637d85bb67eb0a59abde91b0f9a B b4536602d376a36bcbd02d21d5ab42f19d4e5b22 B b4872363fda49f205001d4385ecbc35133c2c755 B b54fe0dfdf3c3d76df1e07fb3686d5d8a1061d48 @@ -159,6 +172,7 @@ B b67537dbace0896073b55b375b8ccdc4cce83365 B b7657a47aca211d46df04998bf79a9e2ca76a545 B ba00202288bce9ba80692f151c2d73b101400c50 B ba293c6e7456e80a5fe92f25a4893d3e45380bf0 +B ba2d7b85d44970cb4abd8cd18ac24178394ef404 B ba8fc3d351121ec8eb2ce37cd12e014f722c741d B bb1edc5dd96c50ed2c3294f6834310e0a6d4381e B bcf0c9f825a7b8d1c86405403d7c089fea2955c0 @@ -180,6 +194,7 @@ B d4f9674baa811936429271cbf64c4a558282c764 B d50ffd09c30e606524fb6ed92119d85ccfa13491 B d54a21628143bc15f51cbe5d63fa42c09d0ab8ac B d5b502a60d2934a42e32cb6225224ff75c66aa37 +B d5d87b8c7949bd0d8d8d5b5d5dc435e14aaf8fa4 B d68f140c76cf7e390dfce134ea5c5d97f129e65d B d8a6bdbd2c84b3fa0187de935e294d5f66974e46 B d9f624e2eca8affa20243583ace087a8cbba3ac8 @@ -192,6 +207,7 @@ B e548a02fa04313fd1b6ec5d9ac78c774e8ad935a B e8514ea3f5fdf33b19d9ddc0639cc1aaf57e1f62 B e8b8e2bc1b5afa4ad93294ebe1bd723a5a4a8f64 B ea778c4f38f882dc97d23bd200683fd9d48b4718 +B eacd93f72c78bd28e9a3222ddfd4f0c33af6b8ec B eba07e615684e475772a7a2d23d7e93a0b099485 B ec4435d70cb0097e34f38bc0f47c0faca03b4bb0 B ecbf4e78586870a507fe4cf91239d51c3f202aad @@ -204,6 +220,7 @@ B f51fb332753e9600a6b6e6dd17b42c1a1494395a B f595ca026d56ec5e58a38780677598d8f9d9ded5 B f71738d894d4143ed57b956ef1dd68aec5b1b41d B f7a091afedbc7ca809a7205d7c053a1f5386865e +B f7a64ca9f12fa2523c35bc5add4be3e979a7604f B f942e1e15d6c4fa83e305eb7452dca8fc80cbdcf B f94861bd6745e92bc1f69acaa907761f3bcc0613 B f97778f0c21a4dc0f083e840e8157fe2f8528d90
