Repository: cxf Updated Branches: refs/heads/2.6.x-fixes 71c73e4a2 -> 9085c8578
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/9085c857 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/9085c857 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/9085c857 Branch: refs/heads/2.6.x-fixes Commit: 9085c8578c026b0a7f41c2abdb2186ea2db389cd Parents: 71c73e4 Author: Colm O hEigeartaigh <cohei...@apache.org> Authored: Thu Jun 26 16:06:04 2014 +0100 Committer: Colm O hEigeartaigh <cohei...@apache.org> Committed: Thu Jun 26 16:06:04 2014 +0100 ---------------------------------------------------------------------- .gitmergeinfo | 7 +++++++ 1 file changed, 7 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/9085c857/.gitmergeinfo ---------------------------------------------------------------------- diff --git a/.gitmergeinfo b/.gitmergeinfo index 40bb156..709ba2a 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -299,6 +299,7 @@ B 415afeef4e5c143175fd9f975939245a9a46c418 B 41a1c6affb500e5a75d2cf67115fdc4db863d8f2 B 41c45daa5aaa78f05b8f975eb92f3975eb50606d B 41e11d892c3976d64a146b6a5489f5a303839d6f +B 423cf0c13c74e6ba5453f775c7207ed11b70792d B 4250e4ef65c5ab4f56967121dea02ca1ed631b01 B 4269d8245445cac23288f0044a3de2ca930f5383 B 426cc33b069f776956f47ae8f2dd476ba1bfc38c @@ -345,6 +346,7 @@ B 4ab70ced8a037666e9c6de658b9575d332dd192b B 4ac67cb41963b23d8874f1d7b883bb945f11943c B 4ae6bbc9304fb1dd17b0abd0ebfc8fb4ac259561 B 4b6f222592f16fc86006557ec0e045a8af1d953b +B 4b77fddec1876f973784df2e0e87e2a1e5f6106b B 4b8bbe90e5a7629709b027da711e0a82b87e9f70 B 4ba78268ef7a6424bec9a8733fb4fd886b833271 B 4bf1ec021bdae5d3df9acf3e7241750569e060e4 @@ -475,6 +477,7 @@ B 662fac4f8c3ca1f179fd75d191f4d2a3c93d5fdc B 664de175a2ad405a61d8bad7aeb5896c701d8f95 B 6695427fe785d38a0cdd1777cf84b9298b659a47 B 671b9fdc20c097ecc9d2b5b9daeb2e7a921f52ed +B 67a6c11d4b2f9985c335b1147976b1a9042a689f B 67db02a1887ea0c7a7d3559ae0fa93bb961bbc8a B 67ed8fbd40d0bfa1b374a441158e8812de879054 B 6845e30623259f0157de9efc2886ee8ae15cbc4e @@ -889,6 +892,7 @@ B c2c50191caf5a7e892bee26d9597652390618221 B c2c9ced19b5acab856e4ef81a2c9e62ca9e14c2d B c31a0c29f07eb66734cc0457130e655faf5248ec B c34f8d5737d77fc1f2e3926217799bbb499d4a0a +B c394bd1dbab8fbef94db1365db77feb486450513 B c3d45a7f2a13c0916cb3ae990dcb7aea8934944d B c3e4c694dce24504edf6a3a22650a0e162e163a3 B c448592ef62960ed158fb7b52d39bd8aeb150801 @@ -900,6 +904,7 @@ B c5317b52dd191fbed6a7331fac1febbfc7cd95df B c55dbb53258a2d13054508994ee352eddbe20e35 B c588595639854a8c4ff17a10741ad587834fae10 B c5a89b7c137566c045a0d13b62132e987ff81b52 +B c5ede8a9f93bf96d056b6ec34462a8e8c42c1a89 B c5ff01a14b9396336c4fe1b939bda7efdd896547 B c6060bf6efecffa40e462b24a99ce1f92a7780bc B c6878bb4ca69aa4cec4282133926ba6434d3d6be @@ -933,6 +938,7 @@ B cd16817a60b2464643cb6c5f50f6e261d1e0b54a B cd21b1c1b2885066d0169fab717b99713ae466ac B cd93bbe6a98ca8b8a4a8f005e533641812dd0281 B ce3285cf3b3d1096c9957164a647af815ad66730 +B ce572e4094c960ed7c54ac7af08c89de08410446 B ce5fa91f11cda1b12f77e011aff59f0ec5182b6b B ce7bb341aad782bd48ee255f8f28fec8b05b3130 B cec0ba1230d9540ec7a8caf2196c44ede1ee2a95 @@ -1014,6 +1020,7 @@ B df59b0005277bf4f232beb28da4b634721275b35 B df73b191b603f5b7a75da3c3f3b043dbff9d3222 B df909075ac5cb11fe993e2a3799e3290dd68e668 B df970c4a4023cdf6e1f1802e485e62f8f3caca12 +B e01a6ce8114dd1c0731a44b3f946f62113474ab9 B e027063c0d5bf5d2f64a08aa032d4320acaea15f B e03f1682952f02952df2a2a4766aad4989ad0732 B e05d81377e5a473a8cf5fe51674bda2c9c8d6246