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/03 16:16:11 UTC
[cxf] 03/03: 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
commit fbbcd0afc7273c854fc699ff3809f5a98b938ecb
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Wed Oct 3 17:15:56 2018 +0100
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 3ff0d12..f700480 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -2,14 +2,18 @@ origin/master
B 01559f20020110407ceb142e4ec53eaddcaeb9d4
B 057f4dc521f02227d7b36bbb508835a9edb69e15
B 25e88017b49bde5a53bce8dab3ecc93aab6dd040
+B 26568235d6db6ef44a74dac1ea1746319913c354
+B 37e9a9b3ed51cb9042fd288ab5f9b847e96bff1d
B 384a11f419c06c52ec07d9f7114bb2134c18ba3c
B 4104641a4b731c72d66b1dace3d9ed4290226694
B 468cf8f3cfe9ef8285cd2ae66caddf666b7aaf13
B 4b7ede2d6cda7651b686653e0645c40b6684b81f
+B 4da42032f95e667a402b113d6daf4bd0514c6d60
B 58e72337226f4e963abfc6f1a65625d86b7003b5
B 9db243c1aa44732996514200b490eb63683540b4
B a3295e61bcf8c00c13a79707841a58131fd9c97d
B acc697f1c88f392bd952e07d50a9ae2ce0b76411
+B ae994168f50894010f1f148ec3b6f35b17e4b63b
B b8236c923ba409087e8db6132963924151918efc
B b8fc2da105029c10cf24ed344198fbefdd190648
B bb098089d18825ddc850fa82f4acee45e2b6ee7a
@@ -19,7 +23,9 @@ B d873c8b623ed10464c1f1bae44a31fc725307676
B da5b01b32a59867b48e2b35a9281b3625f58d514
B e000e8c0b8ed82533cbeb4e3a39dd9fbf128383c
B e9261069513b1947e16bf485182c328c07160e1c
+B f652464526edb0cb7eac277ff64c9f2d02e2b920
B fc656dc1311963f5fc833856984b36b7ccd26042
+M 05b8db050b158d82aad57081a0dbb5e7c92cc3b1
M 0b920d7275800e651b2c48c982b1977249516ddf
M 1449f125586deaf6f5d87e282f0e1502eef4b6b4
M 3904a477e70fe6385777120bfe4820ff9a7713f3