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 2015/04/15 12:28:07 UTC

[2/3] 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/1b5d1452
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/1b5d1452
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/1b5d1452

Branch: refs/heads/2.7.x-fixes
Commit: 1b5d1452f7bed163cf7908fd6d7e47a0332bbc66
Parents: fcbb360
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Wed Apr 15 10:16:47 2015 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Wed Apr 15 10:16:47 2015 +0100

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/1b5d1452/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 1f8465f..9fe6f4e 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -1153,6 +1153,7 @@ B 96e4336334842ce599ca821319f56813b5036486
 B 96e6fa6b664d8dfb1f5a5662a0907cfb60682da5
 B 97204118297f76cc48ee2acb154ad2761b725f19
 B 97251de37cbc9e0035af3c90eb2b2d248211e052
+B 97682e60cadb251ea47fd89917fc03a6b1ffd020
 B 9792971587e7aec6fc0f452d05803813fb2a30d4
 B 97a38ec2966efc4ba8daf916304ba9a70536eac9
 B 97dab3da95f4d833888b30ceb553af6436116e9d
@@ -2246,6 +2247,7 @@ M 68d79ef59b53b24e35c18055a9272fd7ee21e119
 M 6940c5f35041d81151c80c8b3ce06edf5bb0f0a4
 M 69bc8b32faebee6b68c545fd281a460bcedad1b7
 M 69eada2cd44097d11c3bf1be613befdf3be451cd
+M 6a41413eaf53441ad56d10bfa28867bc2ad553de
 M 6a705cbb8a516df07c02bef7bb7398186fccbec6
 M 6a9eec6adec3bd08dac318ad51df10959e919bac
 M 6ad6cca54710c50c8f565c94c65f29182d1be021