Repository: cxf Updated Branches: refs/heads/3.0.x-fixes a3fc169cf -> 6c2b16cf4
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/6c2b16cf Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/6c2b16cf Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/6c2b16cf Branch: refs/heads/3.0.x-fixes Commit: 6c2b16cf4d330c2380a3923b50391a712e3d0980 Parents: a3fc169 Author: Colm O hEigeartaigh <[email protected]> Authored: Fri Apr 17 11:12:37 2015 +0100 Committer: Colm O hEigeartaigh <[email protected]> Committed: Fri Apr 17 11:12:37 2015 +0100 ---------------------------------------------------------------------- .gitmergeinfo | 9 +++++++++ 1 file changed, 9 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/6c2b16cf/.gitmergeinfo ---------------------------------------------------------------------- diff --git a/.gitmergeinfo b/.gitmergeinfo index fb94faa..0881440 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -12,6 +12,7 @@ B 0aaa2b5742a53bf31704939e4bc21906100bbc54 B 0ab9416fda31298e485f2a6864c263447e4b32de B 0ba19453f17be19aa2e46848b1908f776a6abb64 B 0c0555f4ac850ec8e38302d73207170affe4376a +B 0d0bc938103b0ea9311c3b73f6c385aa3e12260c B 0de0309f28e1543660c763c158f4353d6d2189be B 0e639399027b2b43ece5b21f73effa6381a5bf0c B 11243052a6e1656657776bc3a0c586cba962c49f @@ -45,6 +46,7 @@ B 27c2c25dc3c2c3019543e31afdca7b166911f278 B 28e185b27e8c80cd773cac46d1b9b19529c4fab0 B 28e8f04af96d3e353f0da5018a4531d45592c663 B 29f0620a9a025afcd2057cdf97c7d93caf6c179f +B 2a5d201be1b85344585094d0f044e9bf1b605fac B 2afb9d3cacb299bea854d1ff4824e4c981a41d6a B 2ba77327488a8446e6a92af137f644eaf3b06e2e B 2cb99eed19d1a8f097c4ae54967c6e45a7c03d67 @@ -59,6 +61,7 @@ B 3309231e467225b18b24d90d77153a0c572a17e0 B 33c7781f4f847431a7bbdc9335657d3281cd525e B 3506302369c0a28647056c1da469bd9844e45826 B 350b51632f4c5dbd4891636261909c73136981c6 +B 354ac95b70a98b4f2e8f9f33c534b3e885e9a935 B 36fcf426a4946f57b051ce7a388c7190fc97aebd B 3834ba2ea50a164cf2b5ffe15229dcf512e110c6 B 384ad75433037358ea1607c4ddcb0cd978fae10c @@ -98,6 +101,7 @@ B 4fe7844935f9b4ad797760613d143949f9448905 B 504b427081cfc2213ce0a5c050b16af67ca7ff46 B 51f433d54a1d11eac25c32b0dd69f12fef62c060 B 54508131155cc71099f6f54c5ee531e159d79ca2 +B 5577461dfa57cb8c7c49d788276afbd9253d81c5 B 55bda33699ea1c2e84a125253edd594cc2a32ea3 B 577ccc51c269c66e7810eb4aad9f93cb23c78f8e B 5891c0d23b776d41be02e74a3b98a3881970d08f @@ -106,6 +110,7 @@ B 59b7fd7072a71498aecb1b5da6ec51ea89f7381b B 5b26ab08f19f6c55a45c0f1f7ddccd09b0a2ed23 B 5bac26a132e7999bf0bd108d4cffb674873a56ca B 5c678face89e4d38b2879bc4679ce3b92ac3aeb0 +B 5d387616bc1787f3ae50dbe2a185c6abb0e9955b B 5e06ba0c4970700477484bd2409a226aa9ec7f0a B 5f94e273e7e8d99915eeda1189824f13488eb013 B 5faf182264c64bd3c0abc0addc9746b64492c864 @@ -165,6 +170,7 @@ B 90312bc48f6e564bcafdaaebc3cd596c966ee674 B 91d6630c53f222544e4bb512fb5c918d68518138 B 92502a5e2af6e5d3c544f89396de2d05d539fd41 B 92c4738f9e6b96fe0ce8586bb36b9c6444d6e225 +B 93039ab86bea4f2bdac4e5eec4229d3271f4c7ec B 9344b093b8081a68c9f83f0c740d60508e99fd5e B 944eb0ba1043bd4daf9cf087b66bc9cab10b8ff2 B 94cfe7e48a50104b22457aa47b39d06329d16d32 @@ -174,6 +180,7 @@ B 96ed80508cf15f7dc8c2d5a73225a36dbc096ee2 B 970feeed0db20bfe9df5095b6b335146344c222c B 9896b920035a1d1be1aef28a1d1a5eb876445c82 B 99963f9a08c9782b7c661f2b5ff8e9ce95ab3dbe +B 9a2c82620001b76a2065960686f9bc8f384c4d58 B 9ac66adffb73f3474fde064fab1013ecdd24be7c B 9ae69b3b323f48de033f62be9fc2780f11b0c761 B 9b93ca4bda4ba8abce2e2248059f2ccfd35391b2 @@ -262,11 +269,13 @@ B e8514ea3f5fdf33b19d9ddc0639cc1aaf57e1f62 B e8b8e2bc1b5afa4ad93294ebe1bd723a5a4a8f64 B ea778c4f38f882dc97d23bd200683fd9d48b4718 B eacd93f72c78bd28e9a3222ddfd4f0c33af6b8ec +B eadb92c9d8af84f8754efe7f08c69fc60b82c9c3 B eb4ea1fc03b17b7283b427cd4616507f934ef423 B eba07e615684e475772a7a2d23d7e93a0b099485 B ec4435d70cb0097e34f38bc0f47c0faca03b4bb0 B ecbf4e78586870a507fe4cf91239d51c3f202aad B ed18c008f05af7063d5929d072b86048d12dab4c +B ee64acf5f8370cd1e33719e4d9d4e9922e386602 B eee2a947d867c403c212677cf942b3d07fa06fd7 B effcaf3f6cfb4b3287d683285592f2693af42b29 B f18acbcdfc48aca354610614c0ba3a46dcb8332a
