This is an automated email from the ASF dual-hosted git repository.
dkulp pushed a commit to branch 3.1.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit bce54e2177b2752dabbbbed471679a234bcfaa30
Author: Daniel Kulp <dk...@apache.org>
AuthorDate: Thu Jun 28 12:29:39 2018 +0200
Grab changes from 3.2.x-fixes
---
.gitmergeinfo | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 4e50c1b..4ca423a 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -1,4 +1,4 @@
-origin/master
+origin/3.2.x-fixes
B 0033697582635b8f36b69648f3750fd40c435981
B 003fb1e7d2e5790ee44b110da83e1e97ed7d0ec5
B 0041e6b284376103177fc78851b3f605aed02983
