[cxf] 04/12: Recording .gitmergeinfo Changes

[co...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

coheigea pushed a commit to branch 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit 9dfb06c6c66604abe999d2d6c430a9ef7434af7a
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Fri Oct 5 17:23:24 2018 +0100

    Recording .gitmergeinfo Changes
---
 .gitmergeinfo | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.gitmergeinfo b/.gitmergeinfo
index 8b73b31..7e5c59a 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -5,6 +5,9 @@ B 07251d65ed30455dd982fdbe694aab419d2fbfcb
 B 143145643b3bb2f0a7ba97ec216bc59de754fd94
 B 25e88017b49bde5a53bce8dab3ecc93aab6dd040
 B 26568235d6db6ef44a74dac1ea1746319913c354
+B 26c2ede8ae46a6603cd62ea176a8ffc97d636e00
+B 2c53a23f13a313d8a5447d5628cd3fcc937e57c2
+B 35fd40f5b5e043f0044dce9286a9ce922bc30d2c
 B 37e9a9b3ed51cb9042fd288ab5f9b847e96bff1d
 B 384a11f419c06c52ec07d9f7114bb2134c18ba3c
 B 4104641a4b731c72d66b1dace3d9ed4290226694
@@ -12,6 +15,7 @@ B 468cf8f3cfe9ef8285cd2ae66caddf666b7aaf13
 B 4b7ede2d6cda7651b686653e0645c40b6684b81f
 B 4da42032f95e667a402b113d6daf4bd0514c6d60
 B 58e72337226f4e963abfc6f1a65625d86b7003b5
+B 7c7186c506e662ed0512dc47cdf58caa2ff2eafb
 B 9db243c1aa44732996514200b490eb63683540b4
 B a3295e61bcf8c00c13a79707841a58131fd9c97d
 B a9c0c7705f70054a70eb3e95439d2a37731e0332
@@ -26,9 +30,12 @@ B d3de21c45a8f6c74996b5edecfe2e03f8b6a2bd3
 B d873c8b623ed10464c1f1bae44a31fc725307676
 B da5b01b32a59867b48e2b35a9281b3625f58d514
 B e000e8c0b8ed82533cbeb4e3a39dd9fbf128383c
+B e63ce74570117d17552c5cfe9823bc93237583f2
 B e9261069513b1947e16bf485182c328c07160e1c
 B f652464526edb0cb7eac277ff64c9f2d02e2b920
 B fc656dc1311963f5fc833856984b36b7ccd26042
+B fe5603d060881cf801db69ade3f9790423d48094
+B ffff30fdd8fc1b5987158d7d9fec8349b9d735d2
 M 05b8db050b158d82aad57081a0dbb5e7c92cc3b1
 M 0b920d7275800e651b2c48c982b1977249516ddf
 M 1449f125586deaf6f5d87e282f0e1502eef4b6b4