Repository: cxf Updated Branches: refs/heads/2.7.x-fixes f1a0adf9e -> 2b7609499
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/2b760949 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/2b760949 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/2b760949 Branch: refs/heads/2.7.x-fixes Commit: 2b760949902da78a53138d6a0b66a0112d6570b5 Parents: f1a0adf Author: Daniel Kulp <dk...@apache.org> Authored: Tue Jul 15 09:23:00 2014 -0400 Committer: Daniel Kulp <dk...@apache.org> Committed: Tue Jul 15 09:23:00 2014 -0400 ---------------------------------------------------------------------- .gitmergeinfo | 9 +++++++++ 1 file changed, 9 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/2b760949/.gitmergeinfo ---------------------------------------------------------------------- diff --git a/.gitmergeinfo b/.gitmergeinfo index a3fb4fe..ddd3eac 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -107,6 +107,7 @@ B 1429dd09caa3d0e0637669dbbf2b512f4c8bed24 B 14585ed2de2c51a7683e392523db1a5c8c2621d5 B 148bbc8f4a30ecd801e87db7b6621c5d39deb478 B 14949c37fc9ac90a410137721c5ab46ff71367c1 +B 149bfbdc9b63c456a0c0bdb52b2890dbf3b87359 B 149dcf004a4d095fbfee6f12ed048de2257a5b57 B 14a29e1f411ff362f8899d3e9276d8239faf33cd B 14be17bff7941e358189b7058792ada4dbe3c7eb @@ -179,6 +180,7 @@ B 210d24b399a6bc127748e87d8c5b39f168c5cbc3 B 211d028d60c9c60868a004b418bc8f1fccd71d15 B 2131c33de3421cc2da9a0820c93f99c8b51cc952 B 2156bf58d496383900cd964933f09379cf4f8b7a +B 217d41ac09eeba46e95d9fd8b612a01ca9858094 B 21b959991601afd216c075c564a8e891db265110 B 21bfb9ab922392df0ffb93f0aacbc57ecff94fd3 B 21c154987415e5a1c832399b809319fecf0b71c3 @@ -270,6 +272,7 @@ B 329026ec4136d83316ab55c3c0030fe911a19d35 B 32915d5b50cd6804c628ee3bcc1e2509e1aa8430 B 32aea3448fb46e59714b824251a5d3da206b4216 B 32c4b89014f7bfb653484c6771f3a2f2f019d56b +B 32caf7feff3b8730d797f428be5d0d80148be062 B 32e9e2242f59a143568fd2483cd4aef7ed63e33c B 32fd2f750dfe84ea8ec7f6710e79017033283a97 B 330d7a926a2bf1216429a3ac7b5843e3b65df215 @@ -422,6 +425,7 @@ B 5065d9b57a1d5a1fb511190598e40d6683d4b174 B 507b03b8e4def1d3da3d5f81e0c105eda1413058 B 5093b5b3e04e0c67ff6ff14e7e7fa3947673a4e8 B 50ac1ba3e518d9bd01aeca98ac4a142c9fed756c +B 50c57d9bec5f088086548d00afb70796cd0a7e91 B 51053aa2fecbc9620b88f7d25e6f2319c7a4dc04 B 514aebf5b5ae19ec2a844282f4c12e5d65e46c46 B 5150a2a64943c364d43bc80489c333b0cad9c956 @@ -772,6 +776,7 @@ B 91e6b02ac476064808a8926815e4442d23f61378 B 92003dbdda20095cab1bf5740a211a6c9b554b50 B 92203fbada808fccf32814a3d4cda8293b4e8ba1 B 9221cf9995f0e42c4f5e5c40e6f4f42c3c98ac7b +B 923117b48a04a07d3549e3ccaf9b2519ad75c527 B 923ad4a992f9d40285a80d6a8e701b0dda4d52ea B 928dac86f1cbb3141204a3570c584bf9e05704a7 B 92c7421290b6f745c6b21c1a609ae73074e7151f @@ -926,6 +931,7 @@ B b34e1daed084078d5cd5964fbf4741a9f9bffb12 B b35e579fd9302c340f8066e192d8fe6f1f9084cc B b37837f0067dbcb48e8431a8caa2554f32be559c B b384af55e69c2af5826c98b79570da4983de255f +B b39006ba523c6ef085b863be2b2fd19c2c4fd238 B b3a5968313695873325587b74f3a74de2ea9413d B b3a62ba7ca51e976b30d64103766907246cdd03b B b3b3cf8869f39161f8521a33508154799bb54e8e @@ -976,6 +982,7 @@ B bb0f33bf08d59c85940280ce5071a5856686781e B bb257ca5573bc1e23760e9fcb8c899406aab50e1 B bb2757c945ea3bcd93d321782fb4df39aaadd133 B bbc50bca9a1c04cc30a8d618f7cf5fd52dd2d430 +B bbe1a2adbd3d316ec38543ba2beaa8dd7f79b4ad B bbeddfc82ba8cb584fbebd271bfdc9a31e8e0829 B bbee298c2a1e457c2dae8e1d600517d218d4906e B bc3e23bd6dfe14f2d1471a286a6ea3d4e0556ade @@ -1815,6 +1822,7 @@ M d7cb537208095630d373336e973cf262b99d59f4 M d7e0faf75a46151cbbedebd9dd936d750fec1162 M d7f3a21dd059ece008ad43e9b5614cc34c11dc63 M d86d201d00092876a06176638d520fce94e58d89 +M d8f82a8c0cfbeb07f53c1aff81dd73b45544ef0b M d96cfb8d8186e36da23410b83bbaefde3fbf31ad M da25b2af7780b39df7953026a83194aefb15a647 M da63682bc7776b57e79b949abe4ee75af8170017 @@ -1847,6 +1855,7 @@ M e46b896913aeb510c3370f47eb1229b216da47ed M e4b9f2583f1128d225cfd2095810a7630367e6a3 M e4fa39ff9008b6502a836adfb91ea4d16a3bd139 M e50e87ddb80061749d3c306d8d511de72e4e5e77 +M e53db10b30421c11e2d97d96bcd387440bea4d95 M e557d6f2cccd2222c93ed6ccadfc229ef6346770 M e560cfeee66f238d232e7d7073b6adea991c66fc M e5bc06da70826fedb75805a0b3a81add449f5e2e
