Repository: cxf Updated Branches: refs/heads/2.6.x-fixes c49437d89 -> e65f91380
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/e65f9138 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/e65f9138 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/e65f9138 Branch: refs/heads/2.6.x-fixes Commit: e65f91380edede8e5bf70abc87f7c2d8033ab939 Parents: c49437d Author: Colm O hEigeartaigh <cohei...@apache.org> Authored: Tue May 27 15:19:31 2014 +0100 Committer: Colm O hEigeartaigh <cohei...@apache.org> Committed: Tue May 27 15:19:31 2014 +0100 ---------------------------------------------------------------------- .gitmergeinfo | 6 ++++++ 1 file changed, 6 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/e65f9138/.gitmergeinfo ---------------------------------------------------------------------- diff --git a/.gitmergeinfo b/.gitmergeinfo index 53b4f59..49b5c3e 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -465,6 +465,7 @@ B 6695427fe785d38a0cdd1777cf84b9298b659a47 B 671b9fdc20c097ecc9d2b5b9daeb2e7a921f52ed B 67db02a1887ea0c7a7d3559ae0fa93bb961bbc8a B 67ed8fbd40d0bfa1b374a441158e8812de879054 +B 6845e30623259f0157de9efc2886ee8ae15cbc4e B 685e1f4456e03b6673273c3765dfb82f7ddb20b5 B 68642d0273eee375f0de9390e9b6d6002c0b5dec B 68f367ff1be42831794289b2bf9526d6e943b7c4 @@ -656,6 +657,7 @@ B 94591246295a93e5c1e18e41bea1860b93c2e1c5 B 947faeef0d5212edfd0729232d096d1bfdc3260c B 948a81674b46019174618ec82729fa0bcca82de4 B 94a98b3fe9c79e2cf3941acbbad216ba54999bc0 +B 94bce804163fa41f38f7e5f405110ec4e357b4e6 B 94c6412a78f6c305f622ee8fce86ff1d99cc1482 B 951cf567cfc4728349e8cf65dc8e52506ea3c2cc B 953a19f30b03a28c2d9f3fe103e8cbfe86b1c10b @@ -779,11 +781,13 @@ B aece0199ef744b0e69bd87bdbc3f03a3fc047f94 B aefc43764cfeeda2f6c06247ab389a392b54fb80 B af10eb422a2443d88ad0d57a44998bacb1d5d819 B af66ea2229536cb4da0bcfa92237a277b391cf88 +B af7157e4ca04ac2ee21c7698968433befaa779e9 B af8c0ae8275d32841419c97e2564fafd75dff204 B afddbb2f14ff4ab1ab013e9b2e5ee9fc10af59c2 B b0085cc8972aed988d5d00acdf0352f2b51acfd0 B b02aa135b37910e461bb8fa06a4ea5c53242f660 B b03f61f0421597043f46a8301446b86707e26687 +B b08069016ed2861240e4ca8e21726c6cd67bbfd3 B b098fcace1c73ba81370f79a1a5fa05b6adb298f B b0a74ced8bab8558c5e2be14add0cc53cd8431d0 B b0b27d54675970f223db5f2ae39f1cd89bd9d14d @@ -1149,6 +1153,7 @@ M 1e40bd62aa952872013f76e2c51acb7a8be3b17b M 1e4a4539a55f632e2e9cda1092300b9d6df928f6 M 1f1f7dfc94bec49e41c7bd74db80c3e08d00804a M 1f59875036bb1e3e9f3d89ffff9a48c138230695 +M 1f6e85bc7c11b445612993b6105d28fdb92f8bfd M 2133a1a50cd9a45feba0f9334854afc5a4cc414c M 21f901c244a94594baedcf204fb453e467457828 M 221d251f6cdd65bc3940048d4de2d741df9bab10 @@ -1271,6 +1276,7 @@ M 6dd839afbb4d834ed668738bd89e7775c1cf2f9d M 6e18b08ec062bbd6a06468a99e518200f6b8a8e8 M 6f41904a7498ea3c13f493437df4b2d833cbb587 M 6f6f716c1d77bed7e96672006cdf271153850fd6 +M 6fa55c04e83472f4455db1d3c8c9a8de851f50a6 M 702770572034ebdd8d35581b4f404e6b10e40a25 M 715d24acf463b14a56e06527aed02ccf8cb057ba M 7163afce80bfc3dcfb50184e9195e13f110e665b
