Repository: cxf Updated Branches: refs/heads/2.6.x-fixes 397468db5 -> 32245004d
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/32245004 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/32245004 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/32245004 Branch: refs/heads/2.6.x-fixes Commit: 32245004dc6be0abec81aed3457f3fd65fdbd13e Parents: d421e26 Author: Daniel Kulp <[email protected]> Authored: Fri Jun 13 17:10:41 2014 -0400 Committer: Daniel Kulp <[email protected]> Committed: Fri Jun 13 17:10:41 2014 -0400 ---------------------------------------------------------------------- .gitmergeinfo | 12 ++++++++++++ 1 file changed, 12 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/32245004/.gitmergeinfo ---------------------------------------------------------------------- diff --git a/.gitmergeinfo b/.gitmergeinfo index b7018f0..a083887 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -150,6 +150,7 @@ B 21d930bad29c782c193599288fab8aafd79db3b7 B 2244e3974b4a347c76375f94ec85f1bca5be4b90 B 229b468fe4b587f4bd725eb531882ed41621f0ca B 229f841766fe87514ce2eb9bc2f102793142762f +B 22e6b39db88ab99c175ba59bbcf623830614d1d1 B 230e09903869d4c0ddb2a848976a9d187a68b257 B 231621c9d461ca4d32ccec8116dd57bb866e56a3 B 23ab7e0f65f86e801b2976bd7fa2fcf3054f3211 @@ -297,6 +298,7 @@ B 40d7232422845ead3448cb64e0ff72ba5effd9c0 B 415afeef4e5c143175fd9f975939245a9a46c418 B 41a1c6affb500e5a75d2cf67115fdc4db863d8f2 B 41c45daa5aaa78f05b8f975eb92f3975eb50606d +B 41e11d892c3976d64a146b6a5489f5a303839d6f B 4250e4ef65c5ab4f56967121dea02ca1ed631b01 B 4269d8245445cac23288f0044a3de2ca930f5383 B 426cc33b069f776956f47ae8f2dd476ba1bfc38c @@ -418,6 +420,7 @@ B 5c9e8b22a23580b2789d3fa0d23c3bbc53bbe416 B 5ca59ec21e955d818cfddd58c45dfa9223d48a86 B 5d41eb01dd6a93ea34cda544a6c590ba86cdeb0a B 5d46407a25bcef830470f938f3b5dd09b843129c +B 5d717eeb37bbc36c3891acae559830c696f7e428 B 5dabed47fcbefec3c6c0f13afdbedeafb1532e79 B 5dc91e6756414f268adde3ba75908a3569657863 B 5dcb82b132f73959142ee2c5ce25d59fe412c5d4 @@ -835,6 +838,7 @@ B b96fbafdc71fa0c820f59af5ad1c3fe0e9efc906 B b97158ac58e515d56988af0676f309e6ea74d604 B b97f4435a69c3067e58a7255abef4b92cae5b506 B b9d1a53fada247ad82c2e15d94e18348e0908a4f +B b9d8aee62ec3de24daeae2ec3abc4b5f07bf9322 B b9f00b5bb85be95e5fedeabbdad141b866269b84 B b9f305a076f4357911d4ac5fd752185aaf819075 B b9f9f833c5d4a69ec48bedf5c9e5126ebdb81ec4 @@ -854,6 +858,7 @@ B bd5658444f7eead34f068e65daf289158ca74c82 B bd56e16846770bd7369f94be856d7f756cb380f5 B bda818b86024e3aa50c2b9df712b41995b13fab1 B be5043c8f0f7bb5566fae4b4737addf602ef82d9 +B beaa13d185126d67d751a009ac34436b69b2c7e0 B becdab108db28387b61bda75f03ce2f4ec697815 B bef019c0397551bf0ec62b6d46fea3fd6f204aa5 B bf18a65474392d1b4995aceee3d0708d4e9d32d9 @@ -925,14 +930,17 @@ B cec0ba1230d9540ec7a8caf2196c44ede1ee2a95 B ced804d397a0222488baed0369a342150fa18ac9 B cedc1d3c2d8bc16157f7afeac40cfa7a9a48b805 B cef81e3ba16868e4a047307d2abc63fda05b5d83 +B d02107aae3a79bdf281b13798dab756282f492da B d0741c1ba0c6f7e54654191497ea354e135b251a B d0962dbe1504a51f427a830f5f0520b16a03ff96 B d0b3868322a5a322082168d427f12dc427760486 B d0c1bcf2fe373979e5e1c3c659ecd2d2c6ccdae6 B d0f037fe3c9a95d5b716bc9b89b0d4d25c9616a8 +B d104812dff37559a9cfa20de80e1fc351b2ed31d B d18f6f41d5bf89f899b8c40d5d3fa698533e9860 B d198ec4d40eb173f00b0b00749926b6a4a6ff005 B d1bea7acd2d8eb39dde4a2d906f2d17c9f33bd71 +B d1e26dbf40290f7bd99b43f223b346b55f9c8db1 B d2a9bc18c2190e642b14cc5cdda1c69d306bb8a5 B d2b561dc015a7a168d1314ea53341619f15e9b29 B d2e69499b1205cd77ad55fe2f57d2c0ae3500321 @@ -986,6 +994,7 @@ B dbf61d9c0343c8d0f9583ca6468ad832c49b929d B dc1436d3bce27951ba8faa0887e5fb679a58855f B dc23aafaa4c46e7f5b1237f80768969c63e502a8 B dd9c6eea65e199e9dc01ce1e3fb926a8a774f280 +B ddaf7a73a411bbce4d6ac1183aade968939a16e8 B ddc1bb2933d8edcca7f2bcd460706fb900330d41 B de79071419819f662b1ba0a965b1a84119293d89 B deae3617da19424f67428ed413adc806c9c58414 @@ -1049,6 +1058,7 @@ B eba43bb67b353558e436cfe0b61c1a345a022524 B ebaf1c3a5306a1b2b4bcaae1e4bd90e80a514741 B ebdd5b18edd435d7182bc7b610dc90c2dc450c73 B ebec695386fb4a7e20246561d1fc0b295ee37b6f +B ec3deed2b04f2d83c65bdaa6d60fc0929c9f0c0a B ec4b592cb4224b758141c6104eb3f489d0ba29d5 B ec7f25f4b9b483212533a949c93d1c9073258139 B eca6d3d69ed21d8f1482526893074e17d14e6f28 @@ -1060,6 +1070,7 @@ B edf7fa420cc93a4eb076f5e88fdaffbf54a71032 B ee2b03d12f4ff1f8561c8f5c6f0b32b5ffa89367 B ee43b2eafd017f46ce5d6a9321ef542db9f7f5a1 B ee945ff2ea8baa33a24e498b93e46f46b6bb163a +B eeeac57a3feac50257e1a71d9e2511f2042bdcfd B eeee90c3e2e35c32a93a4f7b257d625bb2268d3a B eefe075e24e4cdaf4e63235f31943291a278a331 B ef54d591ce352bd8a9b3265e80f013fa415bd5a1 @@ -1499,6 +1510,7 @@ M df691d712b4e5aad2bf896822a02acf12daf8069 M e0c2d5c717ed2c0e6b0ea6d59ed3d6419041ecfc M e10fbbf2ef79839604aeb595edf8163e5f5e6106 M e2d2b446d80bbcf5c09e22b7c748a7affce5f510 +M e353470fe04248d876149981652ada7ef985b022 M e3bccefba1cdeaacc7376cad86f76d872bcfd74b M e3c7931daab91395e0fa08330f6ec01cdd6f5990 M e435fdc630490a8817d3e7132dd263daccba2bc3
