Repository: cxf Updated Branches: refs/heads/2.7.x-fixes 01b0ef3ff -> b7e18b9b2
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/b7e18b9b Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/b7e18b9b Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/b7e18b9b Branch: refs/heads/2.7.x-fixes Commit: b7e18b9b219554361cfab4c77a84041eba9010ba Parents: 01b0ef3 Author: Colm O hEigeartaigh <cohei...@apache.org> Authored: Wed Oct 21 16:15:07 2015 +0100 Committer: Colm O hEigeartaigh <cohei...@apache.org> Committed: Wed Oct 21 16:15:07 2015 +0100 ---------------------------------------------------------------------- .gitmergeinfo | 7 +++++++ 1 file changed, 7 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/b7e18b9b/.gitmergeinfo ---------------------------------------------------------------------- diff --git a/.gitmergeinfo b/.gitmergeinfo index 405eaf3..c81a95c 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -7,6 +7,7 @@ A rt/rs/description rt/frontend/jaxrs A rt/frontend/simple/src/main/java/org/apache/cxf/endpoint/dynamic rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/ A core/src/main/java/org/apache/cxf/ws/addressing/EndpointReferenceUtils api/src/main/java/org/apache/cxf/wsdl/EndpointReferenceUtils A rt/wsdl/src/main/java/org/apache/cxf/wsdl/binding/AbstractWSDLBindingFactory api/src/main/java/org/apache/cxf/binding/AbstractBindingFactory +B 00047e553024470fd5e05de84e670a23b3f0a41d B 0011b05059467fcd6fbeeb859907d69a9d25efe2 B 003518b1d29250c59493d1b1965303aac8505475 B 00363e6913dc9620d9b5ef981d388ac829e95ca9 @@ -124,6 +125,7 @@ B 0cffef8fc445a8a367315521b03620a14bb8c60a B 0d19ce6ae178b3baa850483b4243f5bc6f4886b8 B 0d2ea5d32f4504d9697364c883ea975f962108e7 B 0d3318d2cb5fc0e7c20e14dcc242865ef11175d5 +B 0d67d48394d6528df52d52363fe94ed0282baf19 B 0d8d92c90f0b02b08892838c69a365b453314206 B 0da3215d1530c3100b33f3eb4b05637845374bac B 0db1e238fedaa359b62387465f9d95ba0805e56e @@ -412,6 +414,7 @@ B 27dd4216bcf72e0a4589aa92583c3e2293305cd7 B 27e7ac7cfb52bbab1051d23b002ec7996f1939cc B 27e80bbffacc5d119d53f203ed1044a406969497 B 27fa54fcf7220076503106fa554b1eb74d8103ac +B 2806c0f0d94c3f3f594d47cdc2c1c2bfdac375e7 B 2816469014ec116559cd405720271457f13432b9 B 28244858cadc3596f760b37c1e1f9331441364d2 B 284341e77e64e826bfd53992d0780ea679e3763c @@ -529,6 +532,7 @@ B 34359c952209dd5b66ede5255f83bcdd729b53de B 3456770325b97a5754aa655c1de99e33744e694d B 345ccc2198303421a9e1428bd96632e4b8a2ff23 B 34740261e05c177014826d822646d5e76428985b +B 3487878cafaa7077f4ba73eff8d1a6804c31e58d B 349a7b61dea339ab3f0f7111d63fd14fd61424fc B 34b5a3b074090b6ddbcb86948a949a98b43a5749 B 34c814b641c482864d121452ac7d8fa7ed0a545a @@ -807,6 +811,7 @@ B 5263a8d1e11be0610aa5ddfee1e0b39bbbebcec1 B 52bee2a6a088f632e81d1e2444e0a9cb9e60e414 B 53270bde15a66fbfbf3896ef398740400719f5d2 B 53283b7dc6e6bc67576a704aa3776f1d8e5408ca +B 532c52a77b2ba197519d4f7741841f51fdef41f6 B 532c5a78ab6d398869bf36c00aeaaf3089ad2fd3 B 535917e7e2960f5ea8bba6f209eaf53616ec5934 B 536e79f2321c0578ae00a394ff1091fc10dad550 @@ -896,6 +901,7 @@ B 5db6a0382e3706afd9fa69277efc9f2fabbf1c44 B 5dbd6cb3500d767129bd1cfdd2b84e6866ba195d B 5dc29c16f921f7dedf604bc082cf9069c11f120c B 5dcb1f334dacda20a5c0d04f131e7a1007c74a40 +B 5e113699c052f7b9fd60be005b88b36c455c0734 B 5e40ea351fa45006513f0fbc7d80747d321f12b4 B 5e673228d95f317c2d9f394011a0b6af6d481d0d B 5e7d0210744661ca3d9225fa972f6754f94d90aa @@ -1459,6 +1465,7 @@ B 988e00cc13c612c9d03ef62096cc2c5f9790d279 B 98a481d18a94a0d41d9ffaa0b924445b4f47be2c B 98aa9b1aa8c03bbf3ed3058f852aae195ce5aaf3 B 98b58d094ce6a5c80470379ffb7eb5e48b0f0ce1 +B 98d0065154572074af7ac0a9503b82d3bbaeabdf B 98d04f03af91e51e3e700f6ddb1c5fb91af07495 B 9941a6bc7a2594c53eec1c52d7e15c03c091ba1d B 9962043b677b1105e9d5def79e8175215541cd31