You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2018/10/05 16:20:58 UTC

[cxf] branch 3.2.x-fixes updated: Recording .gitmergeinfo Changes

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


The following commit(s) were added to refs/heads/3.2.x-fixes by this push:
     new 01f26d2  Recording .gitmergeinfo Changes
01f26d2 is described below

commit 01f26d2bfb3d66c5093817ec25d912c537a55210
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Fri Oct 5 17:20:34 2018 +0100

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

diff --git a/.gitmergeinfo b/.gitmergeinfo
index ec8680c..8b73b31 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -1,6 +1,7 @@
 origin/master
 B 01559f20020110407ceb142e4ec53eaddcaeb9d4
 B 057f4dc521f02227d7b36bbb508835a9edb69e15
+B 07251d65ed30455dd982fdbe694aab419d2fbfcb
 B 143145643b3bb2f0a7ba97ec216bc59de754fd94
 B 25e88017b49bde5a53bce8dab3ecc93aab6dd040
 B 26568235d6db6ef44a74dac1ea1746319913c354
@@ -16,6 +17,7 @@ B a3295e61bcf8c00c13a79707841a58131fd9c97d
 B a9c0c7705f70054a70eb3e95439d2a37731e0332
 B acc697f1c88f392bd952e07d50a9ae2ce0b76411
 B ae994168f50894010f1f148ec3b6f35b17e4b63b
+B b0094cc8813e56e2ec3694193df07d2d5de0ef66
 B b8236c923ba409087e8db6132963924151918efc
 B b8fc2da105029c10cf24ed344198fbefdd190648
 B bb098089d18825ddc850fa82f4acee45e2b6ee7a
@@ -36,6 +38,10 @@ M 4f8ae843f56e3ef84af43ae90f507e196726f0bf
 M 504a1b7827bc76f3c5106b901b44e54513db17aa
 M 86d7c657499b73bdbbd6ba9f1579e76ca0715357
 M 886a055d49d844e445721e4752c7a6360cbe8b9a
+M 9c02f616f6aec1cf43f1d6bac810d606dab98a72
+M ac561c4a2b27bd8b427ff1f91d19c7929a8222ab
+M d419ae389ab4b42bf57106db99758dd8d3b11bca
 M e60e8ab5d7414a0dc581c5666873e1ab0413b107
 M eaa14b96ea5275ff9ee27cf937cd498ca3dcd47f
 M efb2c3082fe8799a9d90a696e31239551b4f1823
+M fd2c5e310aab1e241e868600be9a7748279f0987