You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2014/06/26 17:57:08 UTC

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

Branch: refs/heads/2.7.x-fixes
Commit: f72da13cb5c5b41121fb32221d2c7f664c940dd7
Parents: 93e5d9f
Author: Daniel Kulp <dk...@apache.org>
Authored: Thu Jun 26 11:56:56 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Thu Jun 26 11:56:56 2014 -0400

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/f72da13c/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 7da4abd..5948d58 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -911,6 +911,7 @@ B cbd81c955e5a1f6cef71fe53e088521cdf87c936
 B cc0ba3f09068df3397adf5f7c55362bdffb96174
 B cc5172ceaffb018e3852c9ae3d9e3487cb65d80e
 B cc674df55d596c8774d732ff537e490a159abfe5
+B cd058a9772ad8148cd4f67782f7692d9b4770b63
 B cd3c7cd9e1deac5dfe8c7e01cfaded27b36734e4
 B cd409578835e14f99fbea4d137f84262acce693f
 B cda59ba670339fe9a404b9e9f29ed891529ba187
@@ -1283,6 +1284,7 @@ M 3e3d4b800e7ce26c32028c1e661a15095a900a04
 M 3f927d153e06b47c5e3462a632dc308915af814f
 M 4052ba50657b9814a991b4c4b18ab31beea88fc2
 M 412fcccef8cebaf94b8eebb827672add984ff47c
+M 4150c1dd1545fcc4f5d77cfb0d1a86dbea936ca7
 M 415fc29334310285b25d2c9a59c2640ee56a5963
 M 417d9384948f93adcc0ce1c9f2786e8dcafa434d
 M 4199bf1c6cafedca459603cdc136c7d805226fc5
@@ -1683,6 +1685,7 @@ M f0ee3631f57ef17b3f7749c35d437c0d9c67b6f3
 M f1474c76a33a6d84d588b1138c9816480d3e66de
 M f179d14aa702fcc08e64fe773eac7f2218c13725
 M f1c3bf9af13c5f25e0c354e6145731438aca089b
+M f24a5bec9d7236f9b4b7f208b1f570cdf0381a61
 M f2f957330bee46c0da7643504377163af212d118
 M f37752a54a51861aacb1d27b91ba13af91b92c11
 M f37eff902170f60b1b670700b9547d9540862a47