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/02/05 21:40:24 UTC

[1/2] cxf git commit: Recording .gitmergeinfo Changes

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 640f3a914 -> bcaa41ad1


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

Branch: refs/heads/3.0.x-fixes
Commit: a0680698c90ddade110fd6b8324609e96baf78fa
Parents: 640f3a9
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Fri Feb 5 15:01:14 2016 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Fri Feb 5 15:01:14 2016 +0000

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/a0680698/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 14eec1c..6f47eaa 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -451,6 +451,7 @@ B 9896b920035a1d1be1aef28a1d1a5eb876445c82
 B 99963f9a08c9782b7c661f2b5ff8e9ce95ab3dbe
 B 99f4092de01d60b8369ff84036d543e9d20ecefc
 B 9a2c82620001b76a2065960686f9bc8f384c4d58
+B 9aae5c5622dec1198a333ac6bb3508d3ca4634c1
 B 9ac66adffb73f3474fde064fab1013ecdd24be7c
 B 9ae69b3b323f48de033f62be9fc2780f11b0c761
 B 9b93ca4bda4ba8abce2e2248059f2ccfd35391b2
@@ -646,6 +647,7 @@ B da53162f385fa73957626446cbd63ea269c1ee26
 B db18a965fb238b8515ab74eb63d13c863c279476
 B db51e1a99ab886f179c677579ba798b450069287
 B dbf8d58d565ba7f3a8c43b917f7e9182cabe5efa
+B dbfaf2b5aea3c4b09a825c82cae88c9d5f777aac
 B dc6fe383b095c6823e5de707b1c091556c9c378a
 B dc986e411b2f7449d6cd92481431cfebe18689bd
 B dd3c8f9d05b549d7aeb3804476bdc3fb344cf2d8


[2/2] cxf git commit: Recording .gitmergeinfo Changes

Posted by co...@apache.org.
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/bcaa41ad
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/bcaa41ad
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/bcaa41ad

Branch: refs/heads/3.0.x-fixes
Commit: bcaa41ad148dd37814325f00b5c65b8b9494f23f
Parents: a068069
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Fri Feb 5 20:40:18 2016 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Fri Feb 5 20:40:18 2016 +0000

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/bcaa41ad/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 6f47eaa..7df8685 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -64,6 +64,7 @@ B 1805027c9ce9925fb875e92fc5314aa826632151
 B 18204e5bb0173ccea83c0afd10e4450f370287a0
 B 1824d9cae26c3b141d873d0d01036602ac339c37
 B 18d64577e5ef1ef3ce26e82db1821b894bd43578
+B 194224faeb3e8eb6c8feabe6397f6b42ff0f605d
 B 1960703149a11052490cf16ec3682408470298f9
 B 1a5708e21708a9ed96991cd56ff89b3fd4eac15a
 B 1a8fd7c02bc6a620e276086b665d430217116767
@@ -441,6 +442,7 @@ B 94cfe7e48a50104b22457aa47b39d06329d16d32
 B 9511cd40a9701ee1b46ba28b61154f6f0833b7d9
 B 95c3d899174e39263a773e89a22efbd40be77d4b
 B 962f8167450b19b7819355141bfa9617fcb2e2c5
+B 96802a240f833a1e1cf66cca376f8123b75d68cf
 B 9680acf2ea8b7b9bb08d5db6a07f91a12f26ccee
 B 96d0e7c75f6e583f7a3a8ae1849528863c81d5ad
 B 96ed80508cf15f7dc8c2d5a73225a36dbc096ee2
@@ -557,6 +559,7 @@ B ba8fc3d351121ec8eb2ce37cd12e014f722c741d
 B bb0a94734f583e5b6b1e42303aa6ba7a49958f18
 B bb1edc5dd96c50ed2c3294f6834310e0a6d4381e
 B bb9b5d2e15c0e30d12a6dea3db1a6f720aaf07ad
+B bbe5e870579720272af49b9cea65b8293d5b1f3c
 B bbfe35e464e2f4a6a4783420104d0d90c287fff7
 B bc752dc5bd89b5d70d00435fc1185e72659d7e4d
 B bc9e3714adc8848f37694eea62d33748b01fbb91