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/92a819a8 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/92a819a8 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/92a819a8 Branch: refs/heads/2.6.x-fixes Commit: 92a819a8d76d74dfc5ec35ff58603385adbf3514 Parents: 33620a7 Author: Daniel Kulp <[email protected]> Authored: Wed Jun 4 14:49:09 2014 -0400 Committer: Daniel Kulp <[email protected]> Committed: Wed Jun 4 14:49:09 2014 -0400 ---------------------------------------------------------------------- .gitmergeinfo | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/92a819a8/.gitmergeinfo ---------------------------------------------------------------------- diff --git a/.gitmergeinfo b/.gitmergeinfo index 83fa397..33e06b1 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -123,6 +123,7 @@ B 193848b290f9cc213293f9ad1f6a6ebffa496591 B 1986d0cf1a67d4c60742ad034b9c7274b9d8b266 B 1a233d97a4d0bc36b0d504da3831ba8eca849dcb B 1a5ec8ca715ce69187d288e817281ee52decde80 +B 1a60a057ccb822558e62912c47c5fd95bdaff0ef B 1ba000e2a12d74bc61b2218e18c19ea277a5a3bb B 1be76de3b8367fd9dfd22ddd598dd7486d2ea103 B 1beade456e602a2c42886e1c3b6b35a8bef17047 @@ -154,7 +155,9 @@ B 231621c9d461ca4d32ccec8116dd57bb866e56a3 B 23ab7e0f65f86e801b2976bd7fa2fcf3054f3211 B 23b3ed4d4da9a19c392d9000dfa60e72142b16e4 B 23e45bd5c98a0f9db80b7352be0dbf35b1040839 +B 23e78dcb87ebfa4ed1e6fa2a9d2e53d4f42093ba B 24560d51541dbe162645abb475d989ab8dc5ae60 +B 2497767c07c650d38ba70181b430884660c97ed0 B 24f232d41eaf1fb82aa4172c1a22180c0d1588d0 B 251c45100e4191fa9676cbb73ff50c0ba9331d1b B 25eb57c7a6bf287784fdf6f67130836ba7ef8913 @@ -386,6 +389,7 @@ B 5607028e6dbe7804cec38ae676227740d07467db B 560f00dee8c5c712176ffc25dbe8a9669576582b B 56234aa4ff7250c66181d89bea15478ad671324e B 567a22f26cd21318634b26216451ff2000ab8ea8 +B 56f2bea302170dd1bdc86cc89b8b7e27270a7c92 B 56fe9fa38b541314882a31d842fd9a329d37dd1e B 574802631164c037146333201092d709f469b71c B 57503ef2807889376d8a55a1dc0a41692f28c83a @@ -420,6 +424,7 @@ B 5dcb82b132f73959142ee2c5ce25d59fe412c5d4 B 5dd93963384a9b6d20bb13ab18bf47254932dfc4 B 5e83949b37684d64f823e38c803c32b41150cd08 B 5e8836c429086c61b3fdf13408807c3992335594 +B 5eea93321f5e6041df90ebf8f11ef055c112a31d B 5f5159ecf2b4c5ae3a70b04247fa1beebb93d3f5 B 5f80dd9c9a47470f8e01c741de5beb97995d312b B 5f8e29289710f6356fce6ce7d9ce44ba14561f3f @@ -444,6 +449,7 @@ B 623ca594bc49ed7fd0aaae6134e41a1c20df38d2 B 62bec9b81fcc7248f2b08eb13d91713e72cf3f44 B 62f6156c97a748ab9b853408552483218a45fe74 B 6343a41b13d426357081cc4bdcb43d083e5903b1 +B 63461405e88c07d2df784706183fcff2e3ebaa42 B 63cdec167f458747173540c749265ca034bcf4b8 B 63ea96e8c65edfbc71b32d11ca40dd4203824b9c B 63f7872a0f94950d45509428529a2e4c6cf40847 @@ -530,6 +536,7 @@ B 781939584e7569f1089a6ba6a84c5cfd63efbf6c B 782549cff109222a0cad91aa21520a64ad99ec90 B 78617bbc1e75eb695de577db62ae8227ae3d4d5e B 78668f89d3b56d1c126764cc1cb42c1058e5dd98 +B 78bb7e5f4a79a8f06a24ddb3e00eb994d291158e B 78c5c62e7eafc10c9340d30bdeafa9e0159129d2 B 78c5ca8e5336c080b1c2f88a95e7791eedde648a B 78e004eca847e28409fe3033bb4a4fed1e6090f2 @@ -642,6 +649,7 @@ B 8ec0c14d4f25d8c7337be58b6e403647eac3b47a B 8f7b5979eeabf9e87adff356bbba4882c1d08eab B 8f82a3e23cc6374c8c0f0b9f14f7f92c0ae4d92c B 8f9ebaffa881ed01697362d7bbc48fb1b39bcaa7 +B 900e9ad9ace305bfa939b63e7a10c436e2e0cd9b B 9082d0400b5ce5d1b30b51eeec96e0df8ba70454 B 91756acf166ded54deb94d90ef2a019f37efd652 B 9194763e3d1ffd6e8465e6afee8a15cb51a7d900 @@ -696,6 +704,7 @@ B 9bb030a5b1dd241b33445e33f84b007c646d05e4 B 9bb2439c4a4b7d0d95e12d189d50a5d205f17f79 B 9c48927cc5109c85d913a0b1f21c9abaa9f9b66d B 9c608f6cc6676f0a4cb8b58ea0b63c1033bdce34 +B 9c68a29bcdd5ad254a10b537315b0eb9277c4a4f B 9d387a1e4ba26857d94ba1d381c1e778851f22ca B 9d4f600f061f30915ad12458943c7ce0059cb454 B 9d6204e8d1e01d24944be5b6db518155b3f87892 @@ -719,7 +728,9 @@ B 9fe9d85716d41a9c73c5f6ff30113d8901ddf9e8 B a04262693f199507617833f78cfc636a209cfe87 B a057665b75618be84970e0d42fe116bee3607249 B a0760ff01deef36f84c809ded250183b31578187 +B a0f1198cf102b85c5e4bb0eef03218e2c700ff91 B a120b1754b7e8d8dc221bb2cc5b7ded80f6b4df1 +B a158f4fa7ba073b7c6948e3172f84e89d96dd2a6 B a19c6daa35c016d91c5a9aa37f3168e08e087bf7 B a1a4a855b37403159e90ec7c371a316f939d47b8 B a22756c5d0d85106d89e3255dd1a939130fc6c1c @@ -918,6 +929,7 @@ B d0962dbe1504a51f427a830f5f0520b16a03ff96 B d0b3868322a5a322082168d427f12dc427760486 B d0c1bcf2fe373979e5e1c3c659ecd2d2c6ccdae6 B d0f037fe3c9a95d5b716bc9b89b0d4d25c9616a8 +B d18f6f41d5bf89f899b8c40d5d3fa698533e9860 B d198ec4d40eb173f00b0b00749926b6a4a6ff005 B d1bea7acd2d8eb39dde4a2d906f2d17c9f33bd71 B d2a9bc18c2190e642b14cc5cdda1c69d306bb8a5 @@ -929,6 +941,7 @@ B d32a83895a9d5d643c2953f2d7e002113d57c459 B d3962f78c52bcee36bb14ca97bbe03f111367637 B d3aa4f3a09a8643d69cf7c1406e0d726e67e51c9 B d479c1b40f1f5d39d018cf808ebbdf7331c8f816 +B d501a7707fe3b013c5a6d7e66d1c6f3fa6a59264 B d504ce8a300ab15d4dc768a12a2cb73d8e7507b7 B d524ecdc529792413504392dad4ab366352c6f2b B d52cb6d88f009238f99c6599ab072e4f56eafb92 @@ -965,6 +978,7 @@ B da9095a21f05e24b24f474dda41a4008ee9feb55 B da91f69abe14c8f15e7e59ac95147f33a5c22659 B daae6a9f32bf260f24fe9349be93ab68c7f54836 B dabad53388abbf8e69b5b98d015cda9a0f94c3de +B dac52946ee48b7eb5d568303c27eed77e6b4e860 B db2222d382e9c07795d173820d4b0208b1b45321 B db27d1e180e3cae0c33c76c298a978c5c50e8c9c B dbf61d9c0343c8d0f9583ca6468ad832c49b929d @@ -985,6 +999,7 @@ B e027063c0d5bf5d2f64a08aa032d4320acaea15f B e03f1682952f02952df2a2a4766aad4989ad0732 B e05d81377e5a473a8cf5fe51674bda2c9c8d6246 B e0632b736c1b2057af892b05e603595ad6079927 +B e07c8f09342d584068c5239a8cf174064ef2c151 B e08405c7a3173cd21f8d844443c21b13ccfb9c5c B e0ca4989dfb1237c3a4a2cd79e55d65837e0600a B e0ef00715ffa1c831111518ccb41dbd3cd4abcf0 @@ -1004,6 +1019,7 @@ B e395689b5d391ed304316066a5d950d9eb0afe3c B e3ba10fe917ba42a23007171d1e19e502dd0e0ee B e40c8e25f447f6a8cec76d3814913d62721abe72 B e42376884aa2d0041a02734e5bf7d4a901baa401 +B e43c0580f853ec6f082a2158a8ec72bf37835750 B e4fdf3c606799ca2fea34de15458fe1eb1d18674 B e541fe75e9f1bddea016c82ea38b86d21f8e7ca5 B e57048934c8d235a354a0290feace8f6983b98f3 @@ -1013,6 +1029,7 @@ B e6e39ded3e89f7e119f59c2bcb41e11562f3c597 B e74ff24d2a60980466380a67d0a6559de593bdbe B e80346e5cfcaccd1117fe69764552dd181f878d6 B e81c181452882e2efe9b77e2ce72f3ec610d08df +B e899fd9815fb67d4da0fa7e0e9fdae07e490edaf B e8a751fdcf9820a19f8a49d5f79d44e43c465a0c B e8afadaf94b7ca176774979b56b4d98d67d93cc8 B e95a72edf4c691644aa7f430de667a2599d179fc @@ -1030,6 +1047,7 @@ B eb9ea1e1c049299221f080184a346d0ae5f8aef7 B eba43bb67b353558e436cfe0b61c1a345a022524 B ebaf1c3a5306a1b2b4bcaae1e4bd90e80a514741 B ebdd5b18edd435d7182bc7b610dc90c2dc450c73 +B ebec695386fb4a7e20246561d1fc0b295ee37b6f B ec4b592cb4224b758141c6104eb3f489d0ba29d5 B ec7f25f4b9b483212533a949c93d1c9073258139 B eca6d3d69ed21d8f1482526893074e17d14e6f28 @@ -1138,6 +1156,7 @@ M 1150a45dd6e5fa4a78f091b86cd07d67da7d294f M 130a0d58eeaf50c1c734a7d8fc8f136f0b286cbb M 13c2d92887b53a705ab26f991434aae677f21847 M 142ac28715db0ad464c1841ee04ee1f5ef012cce +M 14d8f97c5c0a26beee3f253531757d89310587f8 M 14e9f016f4880ae594e69c233d0cffb6faef9337 M 15125050e386cdfa3b899d4b6de6a6214e91ec24 M 156c5be140aae87f5415040c2b7411bbf4c530a8 @@ -1381,6 +1400,7 @@ M a6e0d8a6794a3747acc57603f4112aed713e2b4a M a7ed433e50e8c28fb12e6bf45505aaff78daac1c M a95114e138410835fe8c8c7d979a5a945425f3fd M a9d741aa35fd3a31941a987d1573d595cd26053c +M aa7d417f0ed28fac57a8e9ad6ebd9995c1eb13ec M aae58892bd42d2833860d8f6f8e836cd65897453 M ab06aaec07034e736d4452e75543432c008bc727 M ab2f9d355885e50a3bc0094832aa35baccce489e
