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/10/21 22:22:09 UTC
[5/5] 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/17614b08
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/17614b08
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/17614b08
Branch: refs/heads/2.7.x-fixes
Commit: 17614b08d2d70496d7e288b20ad928fb64af031e
Parents: 00636b5
Author: Daniel Kulp <dk...@apache.org>
Authored: Tue Oct 21 16:21:51 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Tue Oct 21 16:21:51 2014 -0400
----------------------------------------------------------------------
.gitmergeinfo | 15 +++++++++++++++
1 file changed, 15 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/17614b08/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 6092145..f2426a3 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -22,6 +22,7 @@ B 01ad820abd4d4dd172c1c6b19bf5a93f828decfe
B 01c79cfc4f335477d3460729782cc243d6f55196
B 01f06dc19334b42c83efa839643a99c9502b3e5a
B 0213b00013706d9e7fa0418a035819ab8e5af5f1
+B 0249513135571231e722d60a1d359942f4c5c104
B 024f503cb739eb800b672f7f87b846350f7abf45
B 0253be4a776598fae2d5952fa2f7fa36aac6deeb
B 02ab1002aaca0285f1f600ea2b0438defc8274a9
@@ -140,6 +141,7 @@ B 16cff265ea0002e225b1bdbbaa6b5a621e0a182b
B 16d26a02d5496df1e6cc406a3ff8dad0efd96573
B 16ed4ea3179c5c19e7baca9c4d1380fd5d995006
B 16f33edc9fe9e055834b1f8d15c69663250894e9
+B 17049b58a2629089d043e374432be733d9f4cca9
B 1704fa3169b05c9e41e0c10b4c5cbd8ea83f1826
B 17407dbb824c0d1f7cf0f34f68205ffc161ae2e3
B 1777dcd70fd82f6c0db18b13b668c37e88b44658
@@ -199,6 +201,7 @@ B 202da725e8e3870d7c215db93f2558750f486910
B 203b64d1769cb5ce25f68f4200618f6706f16239
B 20657583f395bdc2a3c693a1c0655b6e19fafe28
B 20d61c8c0fafe96e372a97988eaf26f97ba8487e
+B 20e77dfc529387ed3557a02d87246a73d87f190c
B 210d24b399a6bc127748e87d8c5b39f168c5cbc3
B 211d028d60c9c60868a004b418bc8f1fccd71d15
B 2131c33de3421cc2da9a0820c93f99c8b51cc952
@@ -254,6 +257,7 @@ B 2932201285b61c4e267a906485000c00f2edb1ee
B 296ff8ec4e19396c6fee2e788968b843a47686ca
B 299f085b723321401460e4fc8343563f795b6b73
B 2a057461bc998a3c539434f7fe21adc5880e9d40
+B 2ab9ae38492f89375eeffb44c614f5b6d2efc2e7
B 2b3bb5e434082422a1631a434b3bd346c0ae766c
B 2b51837e4e51cc33e9cc537423930bb4bb246655
B 2b573e9d69f9b4defac24f6295a7710baebf90b4
@@ -406,6 +410,7 @@ B 417a1813062b78c64be3c397061020e1cefcedf0
B 419f09f68eb35ddd46255f835b07a6d49640314d
B 423c5abd497a05c7f59230ebe5ae0fbe382d8162
B 42409777b56d8da4833415f8871e8640bf54f907
+B 425c95d903cf865406fb8260e3d2cd33e3c88472
B 42931a244c5c4d0e0e3ca98a34b0448511703fcb
B 42bb91e58e1801fe8bc07d9c303c74233d1c0acb
B 433e438143c181abbf1f2004054875a189366fcc
@@ -574,6 +579,7 @@ B 6155656f80e827b0f366c0b18dd4fb27f76330a9
B 6166f14fd666e8c499a789b4dd18a02a67121059
B 618ec139149bb6fb815ec032f78d6ba5e7c280e3
B 61cad675f562b1a5f28d62c7929521e18e0153ee
+B 61f520d3a83182ec2c8fe789b6a897fbddeb67fb
B 62144e297cfd175addf57671e71773cc6a602340
B 621622e3bc47cced4bcd887cdc5d2372460571fe
B 6241186c4e4ec1c14ff467884f83716fe6e2e2c7
@@ -1051,6 +1057,7 @@ B b34e1daed084078d5cd5964fbf4741a9f9bffb12
B b35e579fd9302c340f8066e192d8fe6f1f9084cc
B b37837f0067dbcb48e8431a8caa2554f32be559c
B b384af55e69c2af5826c98b79570da4983de255f
+B b38cfb6fcc1f3d0ce2cc3b98ee1394e911efbab4
B b39006ba523c6ef085b863be2b2fd19c2c4fd238
B b3a5968313695873325587b74f3a74de2ea9413d
B b3a62ba7ca51e976b30d64103766907246cdd03b
@@ -1313,6 +1320,7 @@ B e2cf8e34613e1723d2d05a86d4eec7c4e4b36999
B e2eacb21745088475dbcda3353f25a0663e671d5
B e2ec1c2a2d7cab8d8603b0448bc238fa2ebc45d3
B e3044db0cf3b2819d31e170b9e717e511da35469
+B e31e934b9634d8ccb42f2ec20f55984f08078f6e
B e33fa0c6f2f8cbf1b3d69b6ea47fc53b8e68bfc9
B e3518a7b9ffd4fddfe3bc32ff7bc437a4654963f
B e3a2b0323de8fd58686dc0db135146d645d4fcc8
@@ -1406,6 +1414,7 @@ B f1614ea6d66bee3989b3218a3b8559b776357191
B f16d1694f39d4cc82c874a90c783e49652539f7d
B f18207332e756d013797ff65a5d8d094d20e51e0
B f18544e2d66b5e2cd337d0f8091a5dfaa4ff8ec8
+B f18780cf52189338fee6681374f2622856f09330
B f1a489678051ed4343bb2d1826a5937a0b71e125
B f1d5ca8aee78a87a3cf2382a7498d8acc143bd3e
B f1f64bfeb545eacfbe33eab62b08aed9d25adf99
@@ -1563,6 +1572,7 @@ M 19e99e219c74326ce6edc30a0b69a0bc45ce85d8
M 19fd737888dcee0a24e3b96c6b4aab7cf2309867
M 1a0c4aad7f0360c30539e49a98eb4f16fa554512
M 1a4b7cfd929bdfd1c53feef8099c1a67a24afeff
+M 1a96465f1f599d96e6ea74aa1477a39152b42879
M 1ab9f70d4112432482f7030ea43b3870d524bd0d
M 1c218c8f21311db0c9e77ca401ddbe339f18dc06
M 1c96e19bdc570947b18b343f143c6a85a27c0acb
@@ -1680,6 +1690,7 @@ M 43fdd69f929d455e17694dad033d440c5e07a404
M 445d38ab1bade4408a3b76e495759d4808fd4c58
M 4491a840c61a9355e8fd645ae0c054c7ea70f65e
M 45547032baa0b10bf0a97f4afa582cd6b83890f1
+M 45554c124b0ccad6bfa1ecc95f4f0b5e4900404d
M 45d4bebb74ccb9eb138814eaaff047868f0f1b70
M 45e361cc84b402cdf4f1b97dc35b84ba94512de4
M 46509e7565667595253fb79bc794490c57e60ab8
@@ -1763,6 +1774,7 @@ M 608b823b5eb576cca77e92ac6298ef63c6d65c99
M 60bad6d65fa8ef8b51f72304430cdbde478dd9f0
M 60e570276804496f15e04f06ade2e9308ce04a08
M 6127950d2d60308c582387d2f2c1717c824eecc4
+M 613a165435b0f0df361858edf5e6dcecfb609667
M 61adb143a0f5930357140c0d470e9b44957107f4
M 61c94e87eb7328b7466c21e251d8c5eac0c84574
M 6242c058731ddf5931457d25bf0233e6ea2a7f2b
@@ -1794,6 +1806,7 @@ M 6e6c139095a694011f8a115f5d74cb68ee87f89d
M 6e9405c6d55e92f2047215918f64b8e1147d7450
M 70634720de808c18adafe5c1b9ac52795a165dd4
M 712533732d47b31b7e3c071502471b2007ff7bde
+M 72359ae1f761a1c8ede24db959b32e0a3bfe19d7
M 724bc946c756d792a210c9aa7c757094b744c57c
M 727baf1f02b942f14c3548d0468cf68b945dc440
M 734560f61d1cb368d1e751ff70946b0561209e57
@@ -1861,6 +1874,7 @@ M 8c097962953d2572c338f45aa60bd0ecd8692fbc
M 8cc74d421498ba93a50d3ee5c4bd5e02b82470c5
M 8cd225aa1c9f11ebfeb67f515ed004e73fd702c4
M 8ce34ce6d7fa13d3fee58b4d7dcc5241a1742ff9
+M 8e7b8c1484912d570967852ab8b07d039f6fae24
M 8e9487499d76d98929b205052caf629702c345fc
M 8f4799b5bc5ed0fe62d6e018c45d960e3652373e
M 90b59e32ecfaa946580ecb3ae2f6edb98638ef5c
@@ -2176,4 +2190,5 @@ M fe03e8e76db39520876a5b2e45b8d1096649f019
M fe69b42605a9fd3c8b2835dd98d9f9d91b232add
M ff1da204f47347bd4d5447b757db7fee4cf10fb5
M ffb4278e2c550f7ab7030f2120942e1bbc6ed16b
+M ffbd7bde505d7f7ef6313801faf96b16a8d5551d
M ffc3fb9a865eccd2e3e3e8904c040631058224ce