Repository: cxf Updated Branches: refs/heads/2.7.x-fixes a49e201f6 -> 29b65a9e9
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/29b65a9e Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/29b65a9e Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/29b65a9e Branch: refs/heads/2.7.x-fixes Commit: 29b65a9e986fa43b549141804a62fef1cfc6a0c1 Parents: a49e201 Author: Colm O hEigeartaigh <cohei...@apache.org> Authored: Fri Aug 14 11:32:05 2015 +0100 Committer: Colm O hEigeartaigh <cohei...@apache.org> Committed: Fri Aug 14 11:32:05 2015 +0100 ---------------------------------------------------------------------- .gitmergeinfo | 9 +++++++++ 1 file changed, 9 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/29b65a9e/.gitmergeinfo ---------------------------------------------------------------------- diff --git a/.gitmergeinfo b/.gitmergeinfo index bd6d97e..29c1914 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -170,6 +170,7 @@ B 12eda4f03c46507e78ffc78b0fb1b8f4b5726efa B 12ee3fb1475d16010a6df3b0580c0f67b893d511 B 1314a594481392384c9fbd83040697f3492f05b2 B 133b213787c6e83d094d6ab67a4888aa095861ce +B 134a8c87631ce63650865a10e7f0431d866ba3a5 B 1353a31981751cc4b66242db5ff425275bb04ec3 B 1368e8f332ecc6ef984d4ab6eafbae46bab7f3be B 13b02383a3590149174d0f22bd07853d5cf31a03 @@ -314,6 +315,7 @@ B 20e77dfc529387ed3557a02d87246a73d87f190c B 210d24b399a6bc127748e87d8c5b39f168c5cbc3 B 211d028d60c9c60868a004b418bc8f1fccd71d15 B 2131c33de3421cc2da9a0820c93f99c8b51cc952 +B 2144c1f7811f076c8112c524e487b1c0a35d07a7 B 2156bf58d496383900cd964933f09379cf4f8b7a B 217d41ac09eeba46e95d9fd8b612a01ca9858094 B 21b959991601afd216c075c564a8e891db265110 @@ -658,9 +660,11 @@ B 46193f6de59dd7d3780a62a8f46dfac46476c5f1 B 461b3e98681c758fb5dc1e4e48c4fc98bcf177d9 B 461f8d739a22fa5caaac3552244a693f4bde136b B 46617e66bf125dc660302350a0d04cbc6e09487c +B 4666e2ea95b0c428c50ee893230a27dc5797daec B 467a9d93355e8e87dc0b47d96499512bcee1b52b B 467d320553527adb9208bc22ff3938c9830378c4 B 4681cb3b58270c4ce5a58a196afffd5fe3d14321 +B 468824b2db99c987030ec43b6032b47c0534469e B 46dd6627e2a5c7d0fef9f7426739a8025d28ca4e B 46fbc9688904322de1b2d5a46cdfe24d19f42b4a B 473572b60df957d3cb9aa2fd28dfd91e175624af @@ -682,6 +686,7 @@ B 48ac8d63f70a36b5d192648d347dabfd28293ab8 B 48b00b30b712a55a0e7e5348dead3d666f2309d8 B 48bba92a45b9f9df90f4a01507f5497d93604df6 B 491424b20127a2147aa78c5657ec542fdf786e8b +B 49cfc390dd84a61eb317ff1d9145b51e0d73904a B 49f968cb9aba476220c38e2c6baa7ca00a25dacb B 4a14101c0379ba5c1a53d1e72eeafe16812f3328 B 4a32e60fe9ebeb752a79b3f5dab89baf152d0243 @@ -874,6 +879,7 @@ B 6155656f80e827b0f366c0b18dd4fb27f76330a9 B 6166f14fd666e8c499a789b4dd18a02a67121059 B 618ec139149bb6fb815ec032f78d6ba5e7c280e3 B 61a5ee1a8a82211ba6b4d8d38beca85c6d0361fd +B 61b45ad5c92bd9678baf2455918252359720bc0b B 61cad675f562b1a5f28d62c7929521e18e0153ee B 61f520d3a83182ec2c8fe789b6a897fbddeb67fb B 62144e297cfd175addf57671e71773cc6a602340 @@ -1622,6 +1628,7 @@ B b816789d8a37a0ee970cf692d4a5f0f0c2a2cd99 B b81976817985fe9feb90bedd967793dc1febc327 B b82c554039475f60918e6b68e1999be4b7334d2c B b83e3fc793f14e180eb4346ac6bf73b758476e11 +B b891bf412e2014d5a6531ea0331bc789af90195e B b89704d67dc4a9eb5cd59890956ebdcac0584123 B b8a7ca3f4ffc962f28fa4a3d9a4cf9a458c25f24 B b8c8ff2740307c7c7a874ac7dbbeac7b22959a81 @@ -1767,6 +1774,7 @@ B c92b639c2ad2f67533b21dcd4a6543e28cb676bf B c92eff973089880e5ff8c88524a7971edd428b37 B c934af8a6abc7396950b266cfe043e366b41cd13 B c95370e4cb038964ff8054d18b920da04805ad06 +B c97245b8b2615ed6ce3eabd22dcb9eda099febf1 B c97f1daa12c6a35ecde29d99dabb66225cb53583 B c9af77e944aeb0adc14f4fb905f9676d93fe2abc B c9e85e762130f4f720d792df3332024e83874e9d @@ -1945,6 +1953,7 @@ B de6c14b0368b2a6570b71719a356441413598a33 B de89cfaeee151bdc3b8386f94cf53c1922b66dcd B de9e3e7160ac7d13059dfe31ed864bd7858fde94 B dea6d0726a531ffe6b1834407c74d12f51da4ea6 +B dec493568f388f2324462d4b7a0148ea4bbbdbe7 B deca47d1ff49f43ecd137f3a1a04e771fe1a7712 B df3aa9d613db902539ebef5b0ef47122c86df034 B df457e9b8f456cc571a5a136ffa6f9bc06219588