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 2016/01/20 17:21:27 UTC

[8/9] 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/52e85d05
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/52e85d05
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/52e85d05

Branch: refs/heads/3.0.x-fixes
Commit: 52e85d05042556332723316e4febdb9c87264ebb
Parents: ab292b3
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Wed Jan 20 15:38:04 2016 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Wed Jan 20 15:38:04 2016 +0000

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/52e85d05/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 790543e..e818c25 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -327,6 +327,7 @@ B 894eef1d106f702f19485a8c6b0147d8d2484677
 B 8a82bbfb59141801864e74ebe92f499f117ba6ef
 B 8ab75c2dc7d99d09d47e9413c5ef89d58f1d4d7a
 B 8ac2d4735a9254820ffdb5638f441c4dc051354e
+B 8adcef82a87c124006a869a1553e50ba8efaa371
 B 8bd6dd23e162946fff6596948129a7cfba6aa753
 B 8c4dab45a2b6286e80986c892d4e9ed9b4dc66d5
 B 8c7e2493dc26e1df4a16168a5491ac96509549d6
@@ -680,6 +681,7 @@ M 47b57d723f1468e9d9650617a6013edf4f965900
 M 4915ce370e5f1905f77ebecc8883cc86fcc3e4f4
 M 498a3c2f415c119cd82e1e5779eee4e103755a89
 M 49a5e392144d9137bf47c574e701334ff6c41779
+M 49b2b813deb93106f1f20ae7b067a318e8f04c0b
 M 4a292c0cc49c0c4eef5d50efc78a499c7a5e1783
 M 4ba52d10601f19b852b3e7f88942d1fc33d56113
 M 4c4ef0dd26fb038ab4c2be504639575af4922531