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/03/03 17:16:51 UTC

cxf git commit: Recording .gitmergeinfo Changes

Repository: cxf
Updated Branches:
  refs/heads/2.7.x-fixes e19524962 -> 64145ee06


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

Branch: refs/heads/2.7.x-fixes
Commit: 64145ee0680628dcc76ea6cad26e0fc835231275
Parents: e195249
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Tue Mar 3 16:16:45 2015 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Tue Mar 3 16:16:45 2015 +0000

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/64145ee0/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 28d4564..a350c37 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -281,6 +281,7 @@ B 229bc4ccaed5d4989b3ec363b1964cb2df00cf6e
 B 22ac3203afc7c5017b266e25fdde0df16c294b54
 B 22dbf10ed281f3ec94b159829e21333f4afc0bf9
 B 22e352f442b62be811b25fba200f2f3158d41132
+B 22f0802eb1755df93e7a992fa308d3d909e830f4
 B 2382e8c9753b2ec41a4c870e92828420ab4cac48
 B 23f8e62836eec21a0dfcf911dc026c4b9240c7df
 B 242ffb176a1b2bea2be1762750f66af8d227ca2f
@@ -516,6 +517,7 @@ B 425c95d903cf865406fb8260e3d2cd33e3c88472
 B 42931a244c5c4d0e0e3ca98a34b0448511703fcb
 B 429afd6bbffff7ae6e0f6c4586abbdc6072480dd
 B 42bb91e58e1801fe8bc07d9c303c74233d1c0acb
+B 431a75b720d5479c8b52c0fe829ba2ebb3f102e8
 B 433e438143c181abbf1f2004054875a189366fcc
 B 4354b1a241e71bdcf69de84f2fa32c991b9851c7
 B 4380d3f5115e54ffb1372f712d0aa0aa6fdfd3a4
@@ -639,6 +641,7 @@ B 536f0c957386061b1abfe0a46d772620f18fbf39
 B 537ea185befd1f0f24ff841eb859c14d5fb4ffba
 B 53836207b431ea6cb480373d2643cd119bf01e08
 B 53c84d714912349ec01e1a33e5497d2d8b1c61b9
+B 53c9848bfcd464f2e2db5449d8f1d1d1ce5a7991
 B 53d4e0696c6fafa0648c703922d9698657f6ed05
 B 53d80e130b5a74530605418f109a679c5f3950aa
 B 53f1131e6ef056c0ca06e73041e68eafcfe8a737
@@ -784,6 +787,7 @@ B 676c4ecc4934b118e991957f00b4a81c49348541
 B 67875e91c016c7dc5890a678956ae441b3b164f1
 B 67a469588ef287aa9c423b271552befaf5a3a243
 B 67de1e34748ee3f031b2783a9a50320cbb623457
+B 6821aca4842eac46f12663b8d733129b36065a75
 B 683fa9276cbb8f419d0a5f82427360e8a1987727
 B 685eb54712e9016c4325f7ad28b395a9826c8680
 B 68b030840e7cadb726f3be292b8456444e815344
@@ -1298,6 +1302,7 @@ B afe13e4bef33381f27adcad6b5b0ca857673945c
 B aff4f5d14c7bba6f3b542b61a2a5c80430a1d350
 B b0133860d6db408b21f15f9cb52c7d16cee89b13
 B b04f7ed86cd6da81578c9a66f4bf7db41dc8903c
+B b098cc6e15ecd4107bb5f5203664d74423d81a9b
 B b0e7be04d0d6ba8061831fcc26448e8e5c1c8a2e
 B b0f2aac8e8718c8dbb57d826fc8cfa5f3583b3bb
 B b11ce27dcaa1180249633d3f45583949cd698ee9