Repository: cxf Updated Branches: refs/heads/3.1.x-fixes 1ccbccb3d -> e34c320e3
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/e34c320e Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/e34c320e Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/e34c320e Branch: refs/heads/3.1.x-fixes Commit: e34c320e34ea4911c845b01917479c73edee223c Parents: 9ac7471 Author: Colm O hEigeartaigh <cohei...@apache.org> Authored: Thu Jan 26 10:57:30 2017 +0000 Committer: Colm O hEigeartaigh <cohei...@apache.org> Committed: Thu Jan 26 10:57:30 2017 +0000 ---------------------------------------------------------------------- .gitmergeinfo | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/e34c320e/.gitmergeinfo ---------------------------------------------------------------------- diff --git a/.gitmergeinfo b/.gitmergeinfo index 533f794..490e331 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -106,6 +106,7 @@ B 970080fb9d7208c99ad2bde8e3c6c63a5211b448 B 996d0745469b044cc8a29168add803f22706c443 B 9b6666816a21d8b85cc051be59a8ab6e968c5d0d B 9bcde744c2ad59a67c278d155f2ba22e35bacb7d +B 9f39272a5f92c8bc27a8d3adc4da89f0eb30a54b B a05d75086453fa18ca4f4733f7cc8819693c786b B a219766354d6aee53c7f7a4da91f434af552b437 B a261507ebd3104b1a00298801ec9815ed1e7a728 @@ -264,6 +265,7 @@ M e92e57c1f14de911cd2315a907443c79e91a94de M ed9298066428c0dfc4590a556876d696a4ba13c0 M f462c797eab75e9b6c6c352b4baeb84429866068 M f7f017f2187d59369a7b94bb053f1e297972dce7 +M f8439a92170c4cc6a13cf7b9a3c0eec994ebeec5 M f9a42a528f4edfa7bcc62d5885eebaeb25224cec M fa973bd7ab43099151f83beea351b80c7140eaab M faf461150f178f7f7ae89a3b7c345671e53b8b04