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 2014/12/17 19:02:08 UTC

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

Branch: refs/heads/2.7.x-fixes
Commit: ec245d8fa0c24ca0a0bf944123219c632a1cd1f1
Parents: f56eafd
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Wed Dec 17 17:28:21 2014 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Wed Dec 17 17:28:21 2014 +0000

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/ec245d8f/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 5e7fff1..7b377f9 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -1236,6 +1236,7 @@ B bafb95358cf7422108be1e92020b0b6606c29880
 B bb0f33bf08d59c85940280ce5071a5856686781e
 B bb257ca5573bc1e23760e9fcb8c899406aab50e1
 B bb2757c945ea3bcd93d321782fb4df39aaadd133
+B bb4a50edd512ff59f901565f1591151ed61ee3e7
 B bbbf9a7d4c27d2e837c5d414153bc1e540d96056
 B bbc50bca9a1c04cc30a8d618f7cf5fd52dd2d430
 B bbe1a2adbd3d316ec38543ba2beaa8dd7f79b4ad
@@ -1676,6 +1677,7 @@ M 00597a58fbb8af58a2c84d37cb504496a8d0e6c2
 M 00af0597c650f8b9fccd64e3f362edf9fc9f4b3d
 M 0189dc60a79f876b00f909d1e5d1de3f12c16ff3
 M 01c6ccb0f94ce08cc7d46420852fc63d0459c84d
+M 01e3fff058dc7374a103487dfc011110798db30f
 M 021646df45517d2c06680e20da050f8ebe424a26
 M 02181b59db1c82b9849f0a268f0d8ce0b01f36bf
 M 021f781caab5e7fd82844f0ea734ec23729592ec
@@ -1952,6 +1954,7 @@ M 5b6b226aff25f1da1b4e12e16343dbc1cb8e9dc5
 M 5bd5124661cb48a9ff619dc796e308171510d058
 M 5c21f5ab7e6c5bfbca79d2350c26419e9eec0fab
 M 5c43ede9914108c7d8b9f1d06d6e4601b8732746
+M 5ce623e078e80a6fe12733aea910f996d7c612e6
 M 5d1e71a3e74ae5c8b5740bdaec00cad65918c39a
 M 5d512079a047cd0c934164cc76b5c6663d5ca8b6
 M 5df3f72f1a26b7c9ac2888ab65e41f4105706580