Repository: cxf Updated Branches: refs/heads/2.7.x-fixes 7b69f62de -> bd3bdf834
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/bd3bdf83 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/bd3bdf83 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/bd3bdf83 Branch: refs/heads/2.7.x-fixes Commit: bd3bdf834ca92d4376fe0cb38ba24bddd7ebf3d5 Parents: 7b69f62 Author: Colm O hEigeartaigh <cohei...@apache.org> Authored: Wed Aug 5 12:30:46 2015 +0100 Committer: Colm O hEigeartaigh <cohei...@apache.org> Committed: Wed Aug 5 12:30:46 2015 +0100 ---------------------------------------------------------------------- .gitmergeinfo | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/bd3bdf83/.gitmergeinfo ---------------------------------------------------------------------- diff --git a/.gitmergeinfo b/.gitmergeinfo index adc83e1..5bc66e5 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -466,6 +466,7 @@ B 31cf9c76f6d1be4b901bf06514a9717d936da2fb B 32040bbec6c9efea62af093400b7c33b8aec33ec B 3241cbf80154b4950bcd9df9c452c20e7ac8705b B 326fa2ae986b784a5de37e43c6ef1d6746be54c8 +B 327f95b2420483fb14cedee018d65460481006ac B 329026ec4136d83316ab55c3c0030fe911a19d35 B 32915d5b50cd6804c628ee3bcc1e2509e1aa8430 B 3292a2c4e5b2a02f296112abe9b867050460499a @@ -1124,6 +1125,7 @@ B 800f8f673b3e16f1e398e931ecbf412bc028647a B 8017011a7b653d41628ad7bc5ff05071e3b6488a B 8018b198a9b6a2304f50c37322a7fbeb0f6884ba B 8018c8342a5e4c352093b6b43a4f7b414f1e0227 +B 8028c0fb3e2b9d23a632f664c8d0ff04b1ffb337 B 8057253dc8240f273afdeb53f8faddfb5d1c8168 B 805f87717945c3c87677a4519bbd7f397f1e42a7 B 80b0b9e59cfd67defcc42245e203679fcff15a29