Repository: cxf Updated Branches: refs/heads/2.7.x-fixes 3d4f1474e -> 257caed9d
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/fc39d1f7 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/fc39d1f7 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/fc39d1f7 Branch: refs/heads/2.7.x-fixes Commit: fc39d1f76ca337a2a393d7ae3706efaa5d03be7c Parents: 3d4f147 Author: Daniel Kulp <[email protected]> Authored: Fri Jul 25 16:05:39 2014 -0400 Committer: Daniel Kulp <[email protected]> Committed: Fri Jul 25 16:05:39 2014 -0400 ---------------------------------------------------------------------- .gitmergeinfo | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/fc39d1f7/.gitmergeinfo ---------------------------------------------------------------------- diff --git a/.gitmergeinfo b/.gitmergeinfo index 1947c08..33f42f5 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -115,6 +115,7 @@ B 14be17bff7941e358189b7058792ada4dbe3c7eb B 14c241f0ba605176509620bc2517bec2bd351e4a B 14c434a1a6a3b96f7092f639d639f7ffc09ed700 B 150dc1a3198f35876640cbc708ae9d3e96a88058 +B 153e6c35ab5cd21b0c420cccab9ba57b557179b4 B 155751283fd85ce63d83d1636ac06f094280e82d B 1584291eb208b918e3a232c796b69dd1bfe7776a B 1592a677343fb389a004e828a177a51447109584 @@ -214,6 +215,7 @@ B 2679bcc28f82a782b8a49053f490cf9bb6124184 B 26b684c863bebfa38e6fdd8f462c8d008704c9c6 B 26d3318da2b6a8cdf1ef8a1848939add35f7a673 B 26d332eb2909281152d7ed8232cb7e5c6469ca0c +B 26efeeae05ffd54051458f30583fc516e5712a03 B 271e3bd0e8a1728204e3d8be1f00232cf7c40d66 B 2726988981605b1bf4cb96cfdfcdd8ff57eec6cd B 2727d82a555c5cbc63e57c7c831dfa8500d20b28 @@ -247,6 +249,7 @@ B 2ca813563898e4beb10da293668b740933ab683f B 2d0d60697fdb96b7cac5402de3a8afe4bd3e33cf B 2d2800ba52421c3e4a52dcf561b8f00b6f07f3d6 B 2d2a45a7e5051dad207a02ccd1cc3e3206fb3dd1 +B 2d48a26644651f34f94aae2a0e0563d556f1d987 B 2d4c98545ef4ff66d6f97b514eaeca3bad2664e1 B 2d8264aff8c1b26d60f6d4dee3bcb572927cc81a B 2d92576212e60146e57c1050fa9a63342fe05bee @@ -413,6 +416,7 @@ B 4ad85b22685114376207a68c6bd614ad0d0621e5 B 4b1396b452992a714628bbeada7bd1f9782b1266 B 4b48fab7277f46abdb3d84aed23d0f3163633960 B 4b5ce65228ec89ac8a0391b8ea932942a8c10ac4 +B 4b788d337c0ee95934345271cbe3e7b3c4566d61 B 4b86b20c931e085a4e8e4a472c5aa33beb2e8b9d B 4bee0d1a83a08c82994ac6bcb22383728134d6b7 B 4c343aa62ea777e6665de45dd950de343a3b5f85 @@ -421,7 +425,9 @@ B 4cb5fa951bde2f4f2e115cacc1d83bd1aea18150 B 4d0254adf94a0c73569161a3ed011e53319bce31 B 4d170b09fb600db59fe7dc92c8e3d08bf6c1c3de B 4d718903a14bd6b197473014334d6ba294ecd897 +B 4daba03ba3ad0f97032c1cebe5547ce6799decdc B 4dc42da1d3621024ba6d9a139367b91a6671f45e +B 4e3ffb95a8bdb049cbc6b320d0dd9b8b1751c6af B 4e8f85d8d98b578b799d8a9b568fb78d53b419e8 B 4eb021814b076ac152c6ae4d8f6ac5ca56b6b0ee B 4ff319c6e46e9570003632fe96908ebd03ee9768 @@ -446,6 +452,7 @@ B 532c5a78ab6d398869bf36c00aeaaf3089ad2fd3 B 535917e7e2960f5ea8bba6f209eaf53616ec5934 B 536e79f2321c0578ae00a394ff1091fc10dad550 B 536f0c957386061b1abfe0a46d772620f18fbf39 +B 53836207b431ea6cb480373d2643cd119bf01e08 B 53d4e0696c6fafa0648c703922d9698657f6ed05 B 53d80e130b5a74530605418f109a679c5f3950aa B 53f1131e6ef056c0ca06e73041e68eafcfe8a737 @@ -774,6 +781,7 @@ B 901d2a520b71479151032ffe8b662c6b19dea3f8 B 90271b287605b558eb6beb6797e97d041e4dfb59 B 902a89c5a404d0a541af92a99ec223a7adc18619 B 902eaae78a838e2e5aabc0a082418bd2b6b55610 +B 903b2508397daa08ccdc241330d3985b43ee585c B 90404af4e86e252c7e8724a282eb6190fe9e273f B 905487796650f6e5ecea37bb3790a599d5f75387 B 90ab5afdd29f5daef5af01453cdaa4f40ef099bf @@ -799,6 +807,7 @@ B 94bd1cce747041cbadc644b8ad5394901f435bd9 B 953dbb00319266cfa17c15d322c190c290988ed8 B 95a6d1c0d97ac5aafb5c7f819d9cb120ea04a9e5 B 95b615699694db9517e03987d6e02062760310c5 +B 95bfefb653417b8b23ad481ee3f61139ef0eb5ed B 95caaa8788f08cdaf2458493b6fdec258acc6591 B 95d6cfcd27d16d37497875125a1a0c6aa276fcd5 B 9603da46c34c6e9d45172d8c0c5de236178c0a85 @@ -846,6 +855,7 @@ B 9dd62509e232269afac7a6567fbcc568a3f91f0e B 9e17d8a99e634fa9ce507afb61c1a9306255fa90 B 9e27007895d269fb3e2c47e39f65286d29a7896b B 9e51e56a7f5c85ade60f6a902d1d2aed29a0286f +B 9e663d12d2b240c6d172a96e3043de65fd111404 B 9e745da46f1535afecb11d3f24f21b41bfc2abd3 B 9ef02595b1bb92326110b350c9eda1884dff04da B 9f935ad983d883b0727b47af96761106c7a408ee @@ -857,6 +867,7 @@ B a01b3da2d4257fd44089e574a5ee35acf7ca64ca B a0ae89d855b7c03b0bb2ebff31606fff9b8858aa B a0aef78c0c059be5e3a33debe08a66b37b2989fc B a1157adafdb757e461f5b696cc9bce46b2c96a4a +B a1370a6201d0dfe9e449a0e159abc49831f9b7bd B a17804807504965226b927e22b8cd83a62666c1e B a18be4fac03d3886317b0201123e9917d1a33e60 B a1a6c4b6559f5e6b672eafb2ddd7ce1e1551b53a @@ -869,6 +880,7 @@ B a3505225ee53bf7d25b25ac68687976f01347863 B a3f3df042f158b67426700c95a7be09bb764f3a7 B a45ef8e3fc44ceeb92068dca3d4b70d87c0a19ff B a465a179aef282b716693843898b466150b643cb +B a46e5d4114a59763d550d1cc80a4b57a4d7bba82 B a497422ec0a70862382e26e91b73efd07ccbfb0d B a4c85510a14854349d877510d3688c47457e6b3b B a4e9143f9bba3bf4ab07e0af5d46b30f135d687e @@ -913,6 +925,7 @@ B ad658a159ad1327c084a90d65c84347a8aa640bf B ad82b0bdebba6bafe2711620cef8ce7446c26a1b B ad97191781606abffe05f01c2dd32efc2f9501bb B ad9fef8fe55752ca99a5047efb2fdc54e7d19e01 +B adf6a5b703a12a4f5f74ecb0ea9defde32cdf65a B adfb0d10fa2aeaa1add8fbda90d440bdf2c1a8af B ae039d5762840d76f710393071aad85fb09fd5ea B ae1212c3e25bfbd9b39ad450fa686e7a9ee9114b @@ -1015,6 +1028,7 @@ B bfd50e974ed07f49bf8f981fae30cb80b213db37 B c03492dca099f5b5827ee4a27b01b5a1c9fbf00d B c099c7d07aab30939dd1213411fc7878cc6bb25e B c09be288535b6a059e935a43a6ed5f9dfcbe26ff +B c0bbe48ec37104321bfa2988878184c0763856b8 B c0d434e8d6542c1f18d2055f2c55b98ac32fe519 B c179553822e8de276d14abc2e74c5184de5515a3 B c1d1ee37ab06452b28f972cf0a11f110afb228db @@ -1110,6 +1124,7 @@ B d5c72f876b1c34a41d93f07da546b906d1ed0d3a B d5e5211301d67aeaf81d078cb2fc9b76478e555f B d5f4ca8a34a1f52f89bdc7f2cc886d6ad1ee7819 B d607b8cd828a7f9226746639fce82cc084231555 +B d607ef3537456f2aea1b661f6c5906743e5786b7 B d6a28f1100bafbcb5f962af59f36209b4f4323b0 B d6b4d3f2666cce8a751738c4a9e48899bbc0dca8 B d711d7523901b5b14f4af265710a1c997708a808 @@ -1204,6 +1219,7 @@ B e664599eb155a68f4b889f9180a58d076635811f B e67312c2af732de561a4d8f4f14566f44f813b6e B e67ec6fd6a34d089de726c5ff6db6236659759d2 B e68bd71f0145ee6719d80328366209a07b984df5 +B e6efdf5432f714ead11411495cdf73164a26d561 B e759be97a6b81c18efb442411e0a56e9d4931455 B e76e09aa7eb1011599e1137e88257e122494c116 B e7a542708da68bedecc87ecb031c3c484dbd42a7 @@ -1437,6 +1453,7 @@ M 2db2973fdead79c745584093b90a36e35fdc5766 M 2e0e4aa5c2314a3c1cf5b924ddf1a5a32f9a70a7 M 2e6ce310695f110e8a809297276fdbfaca04c395 M 2f250cf141de8abe1ddf5d053dff35038a453fa9 +M 2f4c97ffa5679ad6f9a80a0f210b6e990a90bbea M 2fd45aa13cf3470f5a4bdc78c2bf0621d3b23079 M 307edfd819d881215047b36fb6f1f79bf0de8bd2 M 3085f0fb44f1b7655bcc83019be20890aa9337a3 @@ -1474,6 +1491,7 @@ M 3cbfe03f6e045c870b95b25d7c427c387555b364 M 3ccc90d58ed677e22aa724f7caeb54cac6b6ef97 M 3cdef913f730e9682f64de9869e2e9effba2fa85 M 3cebf4150a69f9bbaa3541e47a32714fc948e5bc +M 3cfddbac308cdbac8517874c454fd1b294186001 M 3d210220f02839cd8388e36f2ae9e6bf645cbdd7 M 3d370cd3d37d222d6e6021e107d408d7cb6d7a2b M 3e3d4b800e7ce26c32028c1e661a15095a900a04 @@ -1574,6 +1592,7 @@ M 6019486954e7e48efbd393f5fe1e7dcee3a2253c M 608b823b5eb576cca77e92ac6298ef63c6d65c99 M 60bad6d65fa8ef8b51f72304430cdbde478dd9f0 M 60e570276804496f15e04f06ade2e9308ce04a08 +M 6127950d2d60308c582387d2f2c1717c824eecc4 M 61adb143a0f5930357140c0d470e9b44957107f4 M 61c94e87eb7328b7466c21e251d8c5eac0c84574 M 6242c058731ddf5931457d25bf0233e6ea2a7f2b @@ -1918,6 +1937,7 @@ M f37eff902170f60b1b670700b9547d9540862a47 M f3f330de2234a63b30df2199fdabbf861f2050d2 M f40cf72912490c14e7a3f1becb411a442ffe0e06 M f4db015fc658d5d86a0539259cad8b38d863ade1 +M f4f3b9c5e65a5e8f4d9b699c3710175f1ef95c4d M f5684767d04676304063edecacf8d72896f1524c M f57a75aa40be9ab959ae1fade89c2803f2a5b45e M f584187d09471f28578854e288a7c7d612ea82bc
