Repository: cxf Updated Branches: refs/heads/3.1.x-fixes f7407e1ea -> 73f8c955d
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/73f8c955 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/73f8c955 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/73f8c955 Branch: refs/heads/3.1.x-fixes Commit: 73f8c955d8f593928b1f00586043e14daf5d5242 Parents: e8ee2cc Author: Daniel Kulp <dk...@apache.org> Authored: Tue Apr 11 12:24:04 2017 -0400 Committer: Daniel Kulp <dk...@apache.org> Committed: Tue Apr 11 12:24:04 2017 -0400 ---------------------------------------------------------------------- .gitmergeinfo | 6 ++++++ 1 file changed, 6 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/73f8c955/.gitmergeinfo ---------------------------------------------------------------------- diff --git a/.gitmergeinfo b/.gitmergeinfo index 0f5029e..2e4926a 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -170,6 +170,7 @@ B 7eb2d58faacb2dd57c1eddea99c59a8b17807faf B 7f4a24d037c06f76770e969ad7e2a47f4687a33a B 7fc957efa3a193a5f2ae178b8a608717ce4c5b26 B 7fcd84b1f82a203917a5269a2c0c10a0d5b6f877 +B 811daf375e496e42ac9002aaf59f1eb2c1301942 B 8172db9fcfd3472731fdd9e26704bcdd7f63cd76 B 85c397f853c6b7ca0ed6d924445d6173962e1ec4 B 86251ae75e6a663d6419623f47e393dd7a042742 @@ -225,6 +226,7 @@ B afdf9361f1c3ce49c8440a5f2615bde2bb42c684 B b2c10cc6c18a6e6589d258436303c46b3f682f7e B b3ec59efcd10cf64a1bb8a399082071905f5baa9 B b667f5b29b97a96985bd3d2b9d63b2d3d2d7c27e +B b6a4763dc95c874004e600c78888796474f267b8 B b7cd2fb4b883cf9f6972d3593ecb0e1d31be7245 B b8132e5962e326355b699bca445afe9274d0f91d B bacef091c2152d51ebdefbe20244e73d1c26b39d @@ -351,6 +353,7 @@ M 08c9194ce2c567ebfe59f59ee628b1197d90fd43 M 090fa6100ae3a5aa8ae894b0e238acb793f705ec M 09fb22b25333c66514f06652ceaf7fc11bde51cc M 0e5fd5a54cb271ba494e7e30b45d4228b33364a9 +M 0eef86f37288f71fd96506fb2ac7fa27169d1e43 M 10d34e1a812ab2a709376f008c738de68c8720cf M 10ed38c6d1f74f75ae231e8b91b7198b4e162ab3 M 11637433df089a638e173d1ef57441e7456cf2ea @@ -372,6 +375,7 @@ M 1afeea8bdc0ef96df1d52ea343957dc396723f8c M 1e57d379863d01b9330fff797c14d81a56b0b0f2 M 20d0a2811c15cb65a402eb063e1359236d7014ea M 21031e3ab2ae227540e2a078d0336d894361acba +M 2519863ca4d11ca1b6f3ac74361f3eaba3918690 M 2538ae42fb0c774023deed5264291b2fe6658cb8 M 26edcd457ea507075a4c82e2787f11f11a432876 M 29af9d48cee34521fcc9bc27a79d15f5781916a9 @@ -432,6 +436,7 @@ M 7476fc331f00a01851b5fbb66758818bef8ba2c4 M 74a5139520ac289d3a6d93da14573ef7501b8d1d M 74b8db2dcc5fc60a513d9e73e258aeba99727a39 M 7690a1fd087aff24ad8e8e1ab2e0722e24bf3d81 +M 7aa8ebf5450c0a399e86fe5d50865fcd22849f63 M 7ace8c84cff4696e365800fbba12cc789e97971f M 7c3a8b02a62db3bcc5c3a1895e9f30bc4fa3821a M 7dbb31aed4bfa28bd170d6170d76ba4d7f43e7de @@ -448,6 +453,7 @@ M 8583a24ac541dc373503d7a6c59cd90890acdae3 M 86667619dc61c8a84672fc5a583b4517f48176c5 M 896f1abec915897967905762d6e850cfb6bac3bc M 8aebfa30047f32e3a6b4feb7ffdd89208ec4f435 +M 8b78d8c82accc1f0beca55eef8d5bce87c7af792 M 8c6401b76ca76010e7e169656fd2f5fae6f3245a M 8dadf3defb43d13169943b191204be93da63c88b M 8e131133c8566a124605cb06e0b6db98fddb5972