[cxf] branch 3.2.x-fixes updated: Pull from 3.3.x-fixes

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[cxf] branch 3.2.x-fixes updated: Pull from 3.3.x-fixes

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

dkulp 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 a35738a  Pull from 3.3.x-fixes
a35738a is described below

commit a35738a6d0bbab9b9ccf58979787cfd2b9c20d96
Author: Daniel Kulp <[hidden email]>
AuthorDate: Tue Aug 13 16:13:45 2019 -0400

    Pull from 3.3.x-fixes
---
 .gitmergeinfo | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitmergeinfo b/.gitmergeinfo
index 5e1d6ac..0e99346 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -1,4 +1,4 @@
-origin/master
+origin/3.3.x-fixes
 B 003bfeed1d59228471938c8edacb6ef7388cd78b
 B 007342e8bc30cdd03f0d49d96e9a952cf356a30c
 B 00d3ee2de62715fc99daefdcbdd987f1c4e85823