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/12/08 19:06:46 UTC

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

Branch: refs/heads/3.0.x-fixes
Commit: 6498f9932dd39a6320d21199cfba191e78ad1d6f
Parents: efbb7f4
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Tue Dec 8 15:38:11 2015 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Tue Dec 8 15:38:11 2015 +0000

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/6498f993/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 3c89646..c7d7dd0 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -664,6 +664,7 @@ M 5e4a14b4da1f1b27e4df811be80a7f11fc6dae8d
 M 5e919271e2e92f9845d6454b37ab0b86cfc66591
 M 5e97d1e29e85d80f0679748cc4df0d8e0647ee16
 M 5fbe7b49b88deff15f755c15f5a4c421943acc4f
+M 6106f469f5ae311edf2f7de12038822bc03dc073
 M 6129ec5f6735a986660a2d05c6b3b0c9230610d9
 M 6292346fb110f0517b791f91d03fd2515d575388
 M 62d70e977895ae06494730d4f4f04282f0bbeb9e
@@ -677,6 +678,7 @@ M 67f165611178ac59531d774aec8fc2353bd0c8e5
 M 6909358dee4beaa00b493b728dd7689331173d2a
 M 6b355293a7510afc7a40372e0e4b0265cfc3d0f2
 M 6d7ab22d5adcd15bfa3a086345a0b5851fe3e2b2
+M 6d818c6501e8aa16d724e6154fc41e1195c3fccb
 M 6d830354143f91f317d9faf24bbbb63c9ceeab44
 M 6e3224606ecf56b821dac537241f18a59b44e3e3
 M 6fd3ada7af5af1fcb0de337c379e34e7bdb44a56
@@ -798,6 +800,7 @@ M da352523c42bf69ab743f75a5216a03e26a20bef
 M daac77b18e2693ef4ad424937aedc764229a63ee
 M dbc4a26cd47c2609c601dc3640b655ea0a2b60b9
 M dd1b3ebf5b10651a2220a54a1f6e276d2197acf0
+M dfe90b649bee2e7cdd448b16d60b26457385b4e5
 M e2225709c37cb289b99db015b3d8ba5b9b317615
 M e2ad037fbc74f42655ac968415fcb4bded87bb38
 M e3f89d3c07f38f2e01c951d7bad8336e090837ae