Repository: cxf Updated Branches: refs/heads/3.1.x-fixes e33823c89 -> b34521759
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/000c347d Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/000c347d Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/000c347d Branch: refs/heads/3.1.x-fixes Commit: 000c347db18d4a774cccbc826cb1384360f272df Parents: d21f847 Author: Daniel Kulp <[email protected]> Authored: Thu Jan 26 14:21:30 2017 -0500 Committer: Daniel Kulp <[email protected]> Committed: Thu Jan 26 14:21:30 2017 -0500 ---------------------------------------------------------------------- .gitmergeinfo | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/000c347d/.gitmergeinfo ---------------------------------------------------------------------- diff --git a/.gitmergeinfo b/.gitmergeinfo index 490e331..f68f216 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -1,11 +1,14 @@ origin/master +B 0041e6b284376103177fc78851b3f605aed02983 B 0234c09c11c0f89bd17f9b82695daa12af1fad09 B 02d826d7ad223c75ad706c7b5443bd06ee6e2589 B 0336a2399b1980e04372c651368f8718f75a4f14 +B 03cdee74d8f41079bf0a1e06eecc6a993109fba4 B 042d1dbe5f236125c77db8348bf66d4a3d4d2385 B 04d072e8494cb223c8f7b288776640dea68339d6 B 052582d56a99d96773dffcc8d83e96c26030e7c3 B 057b2a6d5d85285446ff762bd3451a0e3e945d7a +B 06bfa1334e86ebcf8e19974708d4aa165296edb9 B 08e8316aa5c575d6117d20c4054405e1ea0e2887 B 09a3b58100c04cacf755509a0160ba01bbce769a B 0af65a4ab3ef2c31b9e88d34ddfbb05c79f0f50c @@ -13,19 +16,27 @@ B 0d4cd0bbcaa6a4f80552d6b38f2a5e721ab20de9 B 0d5577ab87f324205565c4534b59e69049505356 B 0dfaf8d72574511ad9027c663707f9e30b945fbc B 0f74af5ed7561838e1950c758a7a05e588badd10 +B 101e9a0a43f2d819057d995adbb6e6776d5c7f40 B 1116dff4ec9f06e2e69b040f5aa03779c0424c23 B 111d52fd4b92d0222af9bf1c22156145ea01ed01 B 1224d5cc9f646aa3a4924ce9cb045366d2f4cdff B 122d1f64f248294a4303632571ec363aea4c2179 B 1304bc2ffbe6b4c3bfdc4e4f47e5e224e52fd808 +B 140ad80be96ea11d360cd7a1d8e791ca91a2220d +B 16931d7ae0cbb38e987923bf604cd403c1caee7f +B 180d0fcc5e0d061f339e1a3cb32ec53a3ab32b97 B 183a2a4022b912a6c32c1d3e268982b2f78f7631 B 189756a8ff668d39d59cb7ff1658ed40d70ec12b B 189b6643d30eab4d79a0f7722c9277e76e92a1fd +B 1ae4d6dee70587b048c0dcded9cd0b2855c2e225 B 1b2a3d0d2e1a4c8f13368fd7c3e0e1cbfabd2b32 B 1c3085ea94a902e6bf4a49b50c121e778efd28c2 B 1d2ff721ef4d63b86035238516afdf1a82855bd9 +B 1e49510ea71551e543b22f6693307b1436e81db0 B 1f68d848874bc2be86d3e77e408f0b9879c1e93c B 203b5433bc44aa831bdd9b1dd4ab474d192dea6c +B 2103bc5951b0905b134a7bafddd6cc07822132ff +B 219628c58badaf308817a410d61ec704b2246899 B 22755d26ec2f6255004f57deec711ee68ce11d6c B 248c8f0458ce938a65c35006d484c6a4610cde1b B 269e96752b11aeb3e911da76bd3074d768860968 @@ -37,16 +48,21 @@ B 2fb1ccf60f1ba4e9d70f8c2a6329fa1a65e6a352 B 304c62a11b8dbe000cdfb5de857619703bca79f7 B 30a0754ebe160d75867bc2558612d555b88c8595 B 30fab03d70e5655130e6a1ab3081f3563c40cd48 +B 32d044afbe9c6bf4fd4ef829a71af3d1d949315e B 337742ff1215b34643c8c35d8a1a9c4d5238d743 B 343d06d94838cd26f682f7afbcea0e422aa1597d B 38919f57bfb2b880691950fc5f992b5649ea579e B 39851b83af116611ce0efe70c4b9a32ee8491523 B 39a5690d7d50d8481739c290f49128be4d55f8ad B 3b2f2ed2db01f05fa9b648693ce33978ccc8ede8 +B 3be1cef6d16eeee405b7e046c822c27dc7223f24 +B 3f259221fa1dd9227397400ed9653374cb4fdc39 B 3fbedf1397714824b9700cd4d49569087936fe1a +B 40380d8e57cdea0d909f3a9ee207628831c202fa B 40dd6d61c5e6e276df9437e5f000e103ee6101d6 B 4149e50e39a8d4ffb71924d42def376b634ef64a B 428bbe90e4189e70df9a6a450a10320c8be6d42f +B 440538282e39c9da528101968cade1e7dcb32e0e B 4427f7790e522144baa325e5b5c051885e9dc706 B 447f2dac6e160b5cd495558ca8855ed481396c63 B 44c608c205fd2fdac2f2fed9557c2c39730a44d6 @@ -56,16 +72,19 @@ B 4786e832573f1fcc07ed190ab21fdb2820348e4d B 47a431412dbd7669d89a70d6fed49053e70dfed1 B 4b37844e9c15812d1855d0babded79880d2cd6fb B 4bf780105271e91451446a2d96032249486b32de +B 4dd4e1cf0d517021fd65ffe219a9be6c9f75c84a B 4ddf74b1acd8f65b685c8e11b809a06807799f84 B 4f1afbf76d3e525163663b71104ce2adb9cb7a85 B 502db47a7c520767da2977376be5cf2fce3f56af B 517ef67f1a69d386de44153e5e09d51cb47bf4d7 B 519a67dfa240471bb585929f263cd85051a9eb06 +B 52ccbfa5e9fe59662eb8e534c79d4cd48a370703 B 53a46205871434d8c47ed45822e078e5ad6d2c60 B 540a1255be34c047c094f53461925d46c3ed058b B 54910695917fb63a11982a8dc96a3b4d088963c5 B 54b71171e89bb1be7d169ac91bb626c9c1ca293b B 56dab42caaf27e3bedf08cbb419d3644aeccb7af +B 573405dd523139bb935339b89c28f849676da727 B 57cb5447341949836b7d8cc8f00ca3ced68622f1 B 584df3ae111595da1b44ccd9db9567c2172bbb2e B 58b379bdf8cce2434f6033e2d7adab944afff05b @@ -73,6 +92,7 @@ B 59436eadca147ba937a24a4f4fc6ced93cc0bc7f B 59b8615053ddcad353fbebcd9a5b1109ae0897a1 B 5a57f4a89737a5cfa37ffb94f6643c08e2ab6eb1 B 5d73e20b4539bfa4c8ca607b27a1c1ea1850e095 +B 5e068d215b750e3211aaaf3d0b7b366d6a220fc2 B 62060f8bc1f4d85b77ff136cb0576049312b8541 B 629af817f4762a12623e76fb7f7baefe98482719 B 65e1e07fdb810ec9de135530ca3e3d23821836a3 @@ -81,28 +101,38 @@ B 671b1cfce0c423a1e9e8392fdd1750697fa968df B 68f110e5bcfe26d050bd05988ecd9c863e6e8742 B 6918eba1a3229cece97dd90127804b094d82a345 B 6958418ec4989c4391389ee6bfd1d9055ec127a5 +B 69826a090e5f7868b9633e69b76f051fa15b65ef +B 69891e8bdb65fda1caa03810cdc3853a3f357cd1 B 699f4c03de1acb1cf9eb95ad2db792dba5a56ead B 6c324421a358919b4ecb3cfdd8a2e0e16ff81724 B 6d82b75eb982f13f5f071178aeef66e55b0e3fd4 B 6df5deab24016d07e4099712b07535688d164d94 B 6e7b79f6a8b6523b2248937275d92918e5682aa2 B 6fcdc7e9eec2414a40bd3161cf237ef182e313a6 +B 73d1f886ae5265131e8664ee952ffd1cdc82f71a +B 746cd3c0b850702e5b3601d18ce81652a1f3441f B 76edf9350e7640860b66196ad40396d54bbcb2b2 B 77c3f51dcb1f02c8799f4e09676c0697e76a0756 B 7a5e2690c36914ba481570c811f23d6e6b80bc07 B 7b7629682d15345518e66d46e575bf1ac334cf00 +B 7c191d4d590a5ef621a0dd5adfff59512c91daf3 B 7d344ae7ed882a4347d0f8775744646e0013aca5 B 7e2b6f21b7c9d3e922bf93c31af3c5be896509bb +B 7f4a24d037c06f76770e969ad7e2a47f4687a33a B 7fc957efa3a193a5f2ae178b8a608717ce4c5b26 B 7fcd84b1f82a203917a5269a2c0c10a0d5b6f877 B 85c397f853c6b7ca0ed6d924445d6173962e1ec4 +B 86251ae75e6a663d6419623f47e393dd7a042742 +B 89ae972bcc621be990531ce809ffa6f6e2c40ab8 B 8a4e85b24d6d5b438ceb28257c53773d46b5816d B 8b92fe57dd9a661dab382da7d556b1972f513a93 B 8f98be8e72d4dbe18347a7efab91f4b008d8385f B 94b837228a1d9c706aa235bfe23b827eb04da63c B 9505a3c7c82691da2bad94459702a665b14420fa B 955637044097ce6868849e53331706f9e8e5e7e3 +B 969a10c9f2f9027a53c57fc757f62146bb219cd5 B 970080fb9d7208c99ad2bde8e3c6c63a5211b448 +B 970d918a69efe5f8a601f20bb575a23f95a472c5 B 996d0745469b044cc8a29168add803f22706c443 B 9b6666816a21d8b85cc051be59a8ab6e968c5d0d B 9bcde744c2ad59a67c278d155f2ba22e35bacb7d @@ -110,28 +140,41 @@ B 9f39272a5f92c8bc27a8d3adc4da89f0eb30a54b B a05d75086453fa18ca4f4733f7cc8819693c786b B a219766354d6aee53c7f7a4da91f434af552b437 B a261507ebd3104b1a00298801ec9815ed1e7a728 +B a4b794b55b1ea258e9168a58f05794f37aeeb049 B a7362dfaf2141cb4f303f81bbb94c6df81be75cb +B a81534d6655e046e7d316e6de38095fe3f4949cb B a998152a243dabee50aa49f28d76037666adecd9 +B aa5cb3f487fce03a0c069ae4bd33fae82be1e8b3 B ab05d4ee361670d3c251712f5819a0f0b7e114d6 B adcfa17d94da4b27deb8ba952d0bd4dcfcf6972b +B ae83629e6291538e72d300fb35d7f6df7cf064a1 B aed1b1d45ea12b1b1a7f083f756c27ed914ad9b7 B aeecef53263cd1d595d991654f0a783a10adfdcb B b2c10cc6c18a6e6589d258436303c46b3f682f7e B b3ec59efcd10cf64a1bb8a399082071905f5baa9 +B b7cd2fb4b883cf9f6972d3593ecb0e1d31be7245 B bacef091c2152d51ebdefbe20244e73d1c26b39d B bbda68b6d7948d098ee598d248266f4ce81c820a B bcb96eb5cbdfcd473da2ef64709ec0dc541d3609 B bceee342b32f3704ca75176d06067f90c6d3fbdc +B bd24e7efd7f8f4258e8fde99eb63e007378048f0 B bd8aff6652eef048513571b96c703f4333f24dfb +B bd95151baf5368295db6bf9798d106d89f2f8a60 B befeb0484cb195cbcd6163f65c54a94ba26d8335 B bff51a63aa05df40f92c80bb940fb43af78653f2 +B c194254d62b2d89a58fbd77c287b4bb106caa61d B c1e2c973fc42ba7027fdd0ff1964bcbf8e61dbd6 B c1eaf69cb16583f672ddef646dcd7a52cfa23b5d B c2ccecb23ba23497c95be89f9b37f38c69faba7a +B c2daeb5b45b758e9f54ce73dc4567a69c47d9170 +B c3a1392d1656c41a9bbdb24698eb27fbc757628b B c63f06f3782148373912c1e4dc86de0d0c312229 +B c6d4592a8a5d31429333c0e539ae56f517c2523f B c8e788eee8f7b5ce3a2161dfe727f3153ded607b +B c8ee5ae674f6e59b26d7b549481627d21103f7c1 B c92875b6da5934aded09170a30a46d4015cbfa29 B c978ca0274c06abd6ebf67adf2a839c4624b4906 +B c9da051de80efd513e2a3e20c0b5c6ff942291a1 B ca2f8e81168b5b4ca72fa6c3c4529109c7d7c5d0 B cb405d4275a5cf30187c4fbf957dbbb70a9eeacf B ced98c6e937bd93f92dac9043fa0406c696bfd84 @@ -142,19 +185,27 @@ B d26570e26de80d0e0c6870ae5d959bfc8c0d19e4 B d3900dd8431e50e544896cf0ce019595984384bb B d8a0a04d9b8b5206c2e24e976a94f328c73a49bf B da321593b597711af7307a0fc2c11de070653356 +B dbe536f782701cab466c850b3c24bef564b2f9d1 +B dc072a6768932dfd64c8f52f3b297f296e1134e7 +B dd723f846949d66e24ab103c2efde426ea9fb141 +B dd81c1eb76d853f735b2265a18653ab862298468 B de675431040a434c2bd1ef66667472fb4a49a9ab B dfc84b0fac84e001069800b32f01529d50339cdb B e14d803ff84be7c59dd7c2321f1090231967d45c B e1c60863ac10b56d423613c7d3d2f45c7ce18e14 B e2efd0386e210d162c7646f4a4f2aa15e9752924 B e61a83d4ac18fc760fc5d4bc8fb19d6072aaac52 +B e636c50b0d5f9bd811896bd21e20f58d7942b96e +B e6695098373dc39037384bae2544e7b5051d9f2e B e6d84cf9f3ac669003402d122178a55e8b7e4493 B e6f0722615190861192972a51b3986b34efd1f0e B e7895d6a7cb071fdea57f6d2607dabe2d22db47f B e7e75c58c283d0178c6929cf298a68f41f6a8459 B e824784db1bda81c68aaa407f471588acea38865 +B e9b997e808857cda15f428aed8a78ea8d1856db7 B ea458d27bdbd30b0b3ef785d18e45ddf2a75b74a B ebce4a65b15a1a99f18c1ea0111affafc447ce7e +B ec293bde4f937ba6b28907b228649e61d612a528 B ec3103f88b20fc05e92994b6a06b65b4a91dd75a B ec95dfbaf9fae88d21c98305d6415c65c00fd2fa B ecb6eba580c81d35991df66681db8dff99b1b087 @@ -170,18 +221,22 @@ B f2f8b95ad823b38aa68e7a2071eac0b5b637b2aa B f66dea949bdc3f136084115aca4e514bad426380 B f94e1dd9b2a8d27ec5a27bfb7c026e3ae2350e39 B f98785bd8490c4717353f1a9688cae3e7a823ec2 +B fb11380da6e5c157ffd311c2925eb533d134c8cb B fb30f8bffc85fcc3208fcc0e1eda4b54a89b5d37 B fd77d3f3380f805db3547d37cbb2ff72bd033ad0 M 01cd14ce923f1f2cd044746e272b2d525c46f9a6 M 01d06cee06203b0ba616ca1924f1878aecc1a791 M 01fdc40526185ee89202692088fd5367f0690af0 M 0222768baf6b60742c4a8332308edf2be0f4a2e4 +M 0344b6bc0d1e61a3d3b5194f5ae3ebcdf62e8d56 M 03987585902ef5db3c265a353e483f20e31b2c18 +M 04720d55a297aa4778a8194a766d9159ba662d33 M 055f1d738016ae5caf3eba42e656782de8490890 M 0578e16146527b0782530c40ba2db17531756d96 M 07707cd522e63cd0574db378e08f2f820882b5ec M 0865c3a85b9687f857b51d1ae56c8f8e97bdbf5b M 0e5fd5a54cb271ba494e7e30b45d4228b33364a9 +M 11637433df089a638e173d1ef57441e7456cf2ea M 1184e08f0d1c40c754e39fd5d6340d1057fbdd17 M 11e18bf5622cafdb10723cee895885d676b35a7b M 19d8da7f0672b86dbf88a08b54a72297d0ca2d20 @@ -218,6 +273,7 @@ M 6becb31c62ef0845a5078f4ec2124fe7bc264e58 M 7304dfbd8f3044d8d46981abf2058c6cb732d219 M 746914a5084f5db8d0c0f052802c7ef2217b9b6b M 7690a1fd087aff24ad8e8e1ab2e0722e24bf3d81 +M 7e952df66b6ede5c8084aa3387f82224ef04e1ea M 804a957eb4225a1eaf65399881cdcd8552c00f52 M 80ca2370616c28b036c54c95af84ca62f1725a30 M 8118c5a301f22dea16c9d235ad378584a0ae2466 @@ -233,6 +289,7 @@ M 8fbf0941ca52aac406b3efcf2e0d73436c72d0f1 M 8fc9d782901adddf874fe7c2f9500836a0585707 M 910f37767518832cce843c2a093ee833b7c48916 M 91bb2a18f4653f997e455c5089e7a009310591c6 +M 939a75d9d3dbfbe37ead5ca41e5e53727dc40b40 M 955fd4b7fee79642934a828b7758ce14f783364a M 9a9e0a8a37608195c4ef6fbf386728d13d025d2d M 9b2bda583c09861c693122ab631c4bffa2187ddd @@ -254,6 +311,7 @@ M b624c034c5682b54b9faf3d3e90eb0c23cde1a5b M c01c68ddda10ec6db492b86d818498bec0bf4228 M c212240f696e3387df19bbcf22d1851aff320078 M c55034d9621bc904634017b552057474afb93ac2 +M c87613b800a5b2de25d861c3c74a0fb7dcf60862 M cf8ac102e728b8745da265ec969f7b5160829fdb M d46818bd3043d211774de9bc531849f54bb2989f M dba09f00804cc05d943fd95d34882d6368c28edb
