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 2017/03/28 14:38:17 UTC

[5/6] 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/53416a58
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/53416a58
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/53416a58

Branch: refs/heads/3.0.x-fixes
Commit: 53416a586f1aff111dbdfc361e858b1ec1c28b6b
Parents: 6386e37
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Tue Mar 28 14:35:32 2017 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Tue Mar 28 14:35:32 2017 +0100

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/53416a58/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 6580322..7d99e41 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -59,6 +59,7 @@ B 0aaa2b5742a53bf31704939e4bc21906100bbc54
 B 0ab9416fda31298e485f2a6864c263447e4b32de
 B 0ac5dde071c9c2731fca757a2108f5dd698f8af5
 B 0afa064ee3b92a6b3e5fd8c5205a287d7884353b
+B 0b094e88f775dc10caea0b85a52dcc21ef45300c
 B 0b40c84e1440601a9b8779b93812b1c41cddd138
 B 0b7e0e914328aa7a78a2eab00bb1040c703e9b63
 B 0b9097fbd1cddbb4a183e9448576bde2a6eb2589
@@ -1899,6 +1900,7 @@ M aca58c80bbe184c1730d21e9752ef7825a006bc0
 M ad75192db72294e6d117e020aea890a50c166f79
 M aeff8782d28ec57e5aaab9c7b709d89e1d2a7c15
 M af2f7d3a52076f60d0f98a2635e2adef256a9efe
+M af69b53d8460c7c80546afb8ae56dd086a807a6f
 M af7de1d82d77e3653b72ee83b4aa3f91e1a1d039
 M afaf1debd104b7d9850713b866b9f4d58e8dd8d5
 M b0035ade0042160b77b4848939f58efe9a77d6c7