Repository: cxf Updated Branches: refs/heads/2.7.x-fixes e196f40b3 -> 12df45699
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/12df4569 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/12df4569 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/12df4569 Branch: refs/heads/2.7.x-fixes Commit: 12df45699eda2e1009f930867a0aab58d5048893 Parents: e196f40 Author: Colm O hEigeartaigh <cohei...@apache.org> Authored: Fri Jul 17 16:36:22 2015 +0100 Committer: Colm O hEigeartaigh <cohei...@apache.org> Committed: Fri Jul 17 16:36:22 2015 +0100 ---------------------------------------------------------------------- .gitmergeinfo | 5 +++++ 1 file changed, 5 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/12df4569/.gitmergeinfo ---------------------------------------------------------------------- diff --git a/.gitmergeinfo b/.gitmergeinfo index 2b10375..eba506e 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -220,6 +220,8 @@ B 1797749c7e90d0b486d41d3ec78bb0540e26741d B 179c1d418e870de16c60630255cae204c5b50664 B 17a6302e91d067c9a9c71b9897299d1ae21dc9eb B 17c66755fc2376920f9b20b8e28a8314ec0de0c0 +B 17f221b25e01a9c5824b0005b30e8aee0668fea7 +B 17fef20055ca5ae3495e6fe923a9048dab0ac3a7 B 183b062de15297fe5264d023237ad7e8d666604e B 184f5126dd1b12676e6f59dabc28631d5b0a4915 B 185f6743a55a4a318542beb86564c6da6d35d523 @@ -1667,6 +1669,7 @@ B bfb06cb61df28ae5f64ef8f80d3cc63a8b1edb47 B bfd4a8c6fa96616883b8fee7c56a9e84e1e16f93 B bfd50e974ed07f49bf8f981fae30cb80b213db37 B c015b609bc41b8095e1bc83a443cf9d2e44000ab +B c033da8ecbd4ea53f80a163f660c08c61a5664b3 B c03492dca099f5b5827ee4a27b01b5a1c9fbf00d B c0698e5ef5bc51da7599ca2774854c979e258c41 B c099c7d07aab30939dd1213411fc7878cc6bb25e @@ -1733,6 +1736,7 @@ B c766f1069dec6b8682865390e0c6fed133ebbe5d B c775be776e9c6946c55d626847029cbfb6ace677 B c79696bfc1aee1d1204cbd592f6bc5c83c0d9dae B c7a7e9978b7b9e392690d3e5e99c7e6f02f613fe +B c7b9638cf60cc38342828192f5ce80e4a81ce9a3 B c7ba4fe2ee916c54b542e4b33466b4db0aef24be B c7bf868270c0cdf6f794d3e2227f16649ece82fa B c7f4ce23ac7454dc383eb5f0c5d3f6f55aee95e8 @@ -1910,6 +1914,7 @@ B dd2f603ae47ac06bcc6ff413bcb1880ab3144fe4 B dd31efec968b7e0fc084065c058fdb1f6e66af72 B dd56dc911980478cc2702300865d2e9fe6d93ecc B dd61195c15e6810e3edbe6547162e8d19bbf2f72 +B dd618ce580e2cf2394235767e059919d9fc290a4 B dd7889902be831becf1dc57b3639cc882d953267 B dda04a0d825d4fff19eda772b0b1d52c6b5978c2 B ddb5a9740861a2242d97ee582f751cde564e324d