You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by as...@apache.org on 2016/05/18 15:36:06 UTC

[4/4] cxf git commit: Recording .gitmergeinfo Changes

Recording .gitmergeinfo Changes


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/01bf5f84
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/01bf5f84
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/01bf5f84

Branch: refs/heads/3.1.x-fixes
Commit: 01bf5f841d27d94485018912a575e4d9b50caab9
Parents: fa2c624
Author: Alessio Soldano <as...@redhat.com>
Authored: Wed May 18 17:34:55 2016 +0200
Committer: Alessio Soldano <as...@redhat.com>
Committed: Wed May 18 17:34:55 2016 +0200

----------------------------------------------------------------------
 .gitmergeinfo | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/01bf5f84/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index cd299ef..d93b361 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -54,8 +54,10 @@ B f98785bd8490c4717353f1a9688cae3e7a823ec2
 B fb30f8bffc85fcc3208fcc0e1eda4b54a89b5d37
 M 0222768baf6b60742c4a8332308edf2be0f4a2e4
 M 0578e16146527b0782530c40ba2db17531756d96
+M 0e5fd5a54cb271ba494e7e30b45d4228b33364a9
 M 1184e08f0d1c40c754e39fd5d6340d1057fbdd17
 M 1afeea8bdc0ef96df1d52ea343957dc396723f8c
+M 2538ae42fb0c774023deed5264291b2fe6658cb8
 M 26edcd457ea507075a4c82e2787f11f11a432876
 M 2e8219cf3d047abc3a7e2611bf284aadbc20b7d6
 M 386805560479b35276d88605c5acf805e3004aa5
@@ -78,5 +80,6 @@ M a1710bdd783afcd667d9e72ccb031480d3806850
 M abcc137cb9b27e0da0b4270a18ac2a32df1e9990
 M b2b6f0137cd9f1bafff5d487e8383453692a2ff0
 M b2e5fb6583d64deeb8a42d2eeb6935c5f33dc0c6
+M cf8ac102e728b8745da265ec969f7b5160829fdb
 M fa973bd7ab43099151f83beea351b80c7140eaab
 M fe89bf0fb8379428667f66312e6942e906142d6f