Repository: cxf Updated Branches: refs/heads/3.0.x-fixes 9f5d47d90 -> a565df85a
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/a565df85 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/a565df85 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/a565df85 Branch: refs/heads/3.0.x-fixes Commit: a565df85af30e37e06e076bbfe767cde7df0f24b Parents: 9f5d47d Author: Colm O hEigeartaigh <[email protected]> Authored: Mon Nov 21 14:47:07 2016 +0000 Committer: Colm O hEigeartaigh <[email protected]> Committed: Mon Nov 21 14:47:07 2016 +0000 ---------------------------------------------------------------------- .gitmergeinfo | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/a565df85/.gitmergeinfo ---------------------------------------------------------------------- diff --git a/.gitmergeinfo b/.gitmergeinfo index 1824926..e4e6113 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -75,6 +75,7 @@ B 11f3e36e1af5d979a84040f79a8e9cb0f6840d9d B 1214338f24a3a7973f2bd72ca01fc57644bcc45a B 12206c314d34f2e210f7292fcb7a3e894fafd4e7 B 12225d4f560c30839fd8f2ecb6657663d7559a27 +B 123ef5edea1195093ca768f1f5698e5b657f5667 B 12b8e711d2068044caa9ceb57e3fe038e4e92cfc B 12c325a12e897b3fac6afbd9ec2fe34dcaaa9d02 B 12d7631bb74f7034c2635f1f253eef79b0fae0ca @@ -535,6 +536,7 @@ B 6a328a5c03cf04330293221fb1bb44173afa790f B 6a778890e91542ce0f8b92c6bbf3c3d403fa7aaa B 6a77cd049fc39bfd27dfe364fc7c1970e58cc455 B 6a89ad0deeeedcc6336fde214837d852256e34be +B 6a93fc81334352c282ac7ed594d0c14df7101e01 B 6a9b6a5ebae8a1810374457eca74d09005a920cc B 6aa73265ae179bb4ebc3d826c1661ecab387067b B 6af09877545cb1fe34fce0057b5b39cb264b5f7c @@ -1070,6 +1072,7 @@ B d3baa23e3cbac2364498f81ab293aeb61902caa7 B d3e9295d3acfe3c970a325bbbafdba83a0d6e83c B d3ea067659eb3f765df0bee6ce7b4abb55f76ab5 B d3fc22efa8153a1edc1880c05ede6d44208fa03a +B d49f8c16877e54d6b0cbf383acd2953894e3325d B d4a25bbea9911b8c2debfab6724a3cc95532c4af B d4aa22c8dc000946ffb50e7e09156f1c22150e28 B d4bfacb8cc5ed8247ff74eb52061070c0457cbf3
