Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id AF10B200CA4 for ; Wed, 7 Jun 2017 19:54:09 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id ADB3C160BBF; Wed, 7 Jun 2017 17:54:09 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id B4CE1160BE9 for ; Wed, 7 Jun 2017 19:54:08 +0200 (CEST) Received: (qmail 76989 invoked by uid 500); 7 Jun 2017 17:54:07 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 76669 invoked by uid 99); 7 Jun 2017 17:54:07 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 07 Jun 2017 17:54:07 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 3DE46E1797; Wed, 7 Jun 2017 17:54:07 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dkulp@apache.org To: commits@cxf.apache.org Date: Wed, 07 Jun 2017 17:54:14 -0000 Message-Id: In-Reply-To: <03770b0a279141eaaee8ea03b74164e3@git.apache.org> References: <03770b0a279141eaaee8ea03b74164e3@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [8/9] cxf git commit: Recording .gitmergeinfo Changes archived-at: Wed, 07 Jun 2017 17:54:09 -0000 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/82f5ca8e Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/82f5ca8e Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/82f5ca8e Branch: refs/heads/3.1.x-fixes Commit: 82f5ca8e33d9c8c53637d7b45864c9b1ff95ac1f Parents: 66cc4be Author: Daniel Kulp Authored: Wed Jun 7 12:44:25 2017 -0400 Committer: Daniel Kulp Committed: Wed Jun 7 12:44:25 2017 -0400 ---------------------------------------------------------------------- .gitmergeinfo | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/82f5ca8e/.gitmergeinfo ---------------------------------------------------------------------- diff --git a/.gitmergeinfo b/.gitmergeinfo index 88433c0..b6592e6 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -61,6 +61,7 @@ B 20b73a780e54f3815ab6b8c5f41d052f75745ee1 B 2103bc5951b0905b134a7bafddd6cc07822132ff B 219628c58badaf308817a410d61ec704b2246899 B 22755d26ec2f6255004f57deec711ee68ce11d6c +B 234331c85ce6753a6d77d324e572169218eb75a0 B 248c8f0458ce938a65c35006d484c6a4610cde1b B 269e96752b11aeb3e911da76bd3074d768860968 B 26f43025348e101e981e3f64ecc3ddf483ad7fb3 @@ -77,6 +78,7 @@ B 333632ee013b26b6ed15d05818971d83927bd43d B 337742ff1215b34643c8c35d8a1a9c4d5238d743 B 343d06d94838cd26f682f7afbcea0e422aa1597d B 3450d3854e97dbd67eeaa862d09d39cce9846de9 +B 35ab874f8a1b2ad4fe045e48465c9bdeb46f685f B 38919f57bfb2b880691950fc5f992b5649ea579e B 39851b83af116611ce0efe70c4b9a32ee8491523 B 39a5690d7d50d8481739c290f49128be4d55f8ad @@ -84,8 +86,11 @@ B 3a46e586b405c79a98e37d33a30b2fa22905f853 B 3b2f2ed2db01f05fa9b648693ce33978ccc8ede8 B 3be1cef6d16eeee405b7e046c822c27dc7223f24 B 3bebf6b49283d9a9c36365c030533a3508f836c7 +B 3c1e2e7245aa89b9ac097e210ff70cdfa6c301a4 B 3ce7f00461d9c868301003b5c16138c491a9ac0b +B 3e50ff46becd978ab228b8d8a0ebff5e51b2274f B 3f259221fa1dd9227397400ed9653374cb4fdc39 +B 3fa435a2908d95b656933d0d34f9ccf8c0153ffe B 3fbedf1397714824b9700cd4d49569087936fe1a B 3fc02937bd8ba0bb500a2cdfd8afa863b9cf6aec B 3fe8e92229ba50dbc6758e6420b44ac16751281e @@ -143,11 +148,13 @@ B 59b8615053ddcad353fbebcd9a5b1109ae0897a1 B 59b972618b40c5dbaca2772673ded17c5273e7d2 B 5a57f4a89737a5cfa37ffb94f6643c08e2ab6eb1 B 5b4275ce202777828633dbb65133d3fe44f1d404 +B 5ce0b6eb1488d8ac575ee055d5f8cf83863546bf B 5d73e20b4539bfa4c8ca607b27a1c1ea1850e095 B 5e068d215b750e3211aaaf3d0b7b366d6a220fc2 B 5ea90a91d9148aa59aeb9b7e6611b58fb8da1fe4 B 604167d9f0cfc67e01219a19a95353176ce38f79 B 61a361610d57aaf18f2c574916621ac09af45151 +B 61eadf5265cbcf47c8b2d5a6d6235eb2f621b456 B 62060f8bc1f4d85b77ff136cb0576049312b8541 B 629af817f4762a12623e76fb7f7baefe98482719 B 62fd990682c0c6ff915356fb9b5f0a32efc20424 @@ -192,6 +199,7 @@ B 7d344ae7ed882a4347d0f8775744646e0013aca5 B 7dbce543a96c6ec1c6f02ab0530146c3507fa205 B 7e2b6f21b7c9d3e922bf93c31af3c5be896509bb B 7eb2d58faacb2dd57c1eddea99c59a8b17807faf +B 7f07dac41850cd4e858892d655babe343232cd32 B 7f4a24d037c06f76770e969ad7e2a47f4687a33a B 7fab6245608119634271e580166120b9c55dce48 B 7fc957efa3a193a5f2ae178b8a608717ce4c5b26 @@ -252,6 +260,7 @@ B abfd5936fee6562b1b5c49d7522f0975390bcfed B adcfa17d94da4b27deb8ba952d0bd4dcfcf6972b B ae83629e6291538e72d300fb35d7f6df7cf064a1 B aed1b1d45ea12b1b1a7f083f756c27ed914ad9b7 +B aeeb4df2e5c4133164014e15ebf221a2dcd02eec B aeecef53263cd1d595d991654f0a783a10adfdcb B afdf9361f1c3ce49c8440a5f2615bde2bb42c684 B b2c10cc6c18a6e6589d258436303c46b3f682f7e @@ -284,6 +293,7 @@ B c1ba5d90e34993d737f0944dbb69ccda7c4bcfd1 B c1e2c973fc42ba7027fdd0ff1964bcbf8e61dbd6 B c1eaf69cb16583f672ddef646dcd7a52cfa23b5d B c2517eb552704a406cfbc45eba4822a84e5ca7da +B c282dcee8373b9564c747fc8fac4e4e9a3b3afc6 B c2ccecb23ba23497c95be89f9b37f38c69faba7a B c2daeb5b45b758e9f54ce73dc4567a69c47d9170 B c3a1392d1656c41a9bbdb24698eb27fbc757628b @@ -336,6 +346,7 @@ B e1c60863ac10b56d423613c7d3d2f45c7ce18e14 B e1d950605941ef77bd4a3e9e4ad47eb63ac8f221 B e262bd20dbc8e8567ffe0c8ed3d394191696e981 B e2efd0386e210d162c7646f4a4f2aa15e9752924 +B e3b77cc7100f304dcf8d5e29bce78c800c4d4cd1 B e3eed6e693d17f52089a903cf9e293bc6ccdc73d B e5b9f0e1695e73c33a40248d45fa4eba034d39b3 B e61a83d4ac18fc760fc5d4bc8fb19d6072aaac52 @@ -348,6 +359,7 @@ B e7e75c58c283d0178c6929cf298a68f41f6a8459 B e824784db1bda81c68aaa407f471588acea38865 B e856de5370025ec6f897ef214e7f898fd8cb6756 B e90f3dd6422fa059ebea4c92763c73c8685e185e +B e91272173b054ae8e5f1535b40765d6bbb545601 B e9b997e808857cda15f428aed8a78ea8d1856db7 B e9e1fbe33658421590ec149b0f82c12d2fed2c53 B ea458d27bdbd30b0b3ef785d18e45ddf2a75b74a @@ -358,6 +370,7 @@ B ebd1c24df1b405bf0478f191ba055d96e8ccea41 B ec293bde4f937ba6b28907b228649e61d612a528 B ec3103f88b20fc05e92994b6a06b65b4a91dd75a B ec95dfbaf9fae88d21c98305d6415c65c00fd2fa +B ecb3ccd32cfa82d1175e2e15642e22e8172ec25a B ecb6eba580c81d35991df66681db8dff99b1b087 B ed512e646cfac342bdc2b6df117e9a81eacf4061 B ee6ceea0d493b1b2dc6d83ca6923c3baed81885e @@ -422,6 +435,7 @@ M 16163d8044be801683d1fb2d2d44507f43be2d6a M 1622823593e1a9a836e0e354ad37ea1cc56c3fb8 M 177579cad9c1a41b9b7c68ad69ed84de9fa08561 M 17b0b5f444e5eea9b1c553ba512dbde99ef2c92a +M 18418ec3429869323bbfc839dc3fd99ec620725b M 19121e3da243bb1516d605fd1498087efedd387c M 19a4d72a32f1e18bec621af403ecdf21d97453af M 19c72e2049bf4cd98bd9e3e09a21e555226f1e60 @@ -435,6 +449,7 @@ M 21031e3ab2ae227540e2a078d0336d894361acba M 2519863ca4d11ca1b6f3ac74361f3eaba3918690 M 2538ae42fb0c774023deed5264291b2fe6658cb8 M 26edcd457ea507075a4c82e2787f11f11a432876 +M 26feb75455abbf3ef999804395d4c5d5348042a2 M 2735d624afed00841621ce4fe0e9c864d76f5bcc M 29af9d48cee34521fcc9bc27a79d15f5781916a9 M 2a76fe1ef1989fbfaf86d70984f049259715d3c4 @@ -474,6 +489,7 @@ M 4a418df6e3bb784b9e27150d2019bbbc63ea3cfd M 4a7ee47a9b57ec3c97dc40217229a80478f931f2 M 4aaa6cc53f694e61eede9c3ef90484fe8f4f3770 M 4b0868a8ee6f53d8543860a458821c35ec2a79a2 +M 4b23cab79851b073d9902e504081c13db31145cb M 4d493d461f70864aa1b5cab7bcbfbc31a31cdc01 M 4e5119b3d1d807fb6885ec67ce28180beb55c360 M 4f4ce80ba2de80219e13943cbd6edbf411117234 @@ -500,6 +516,7 @@ M 6613e46662317ea151f72e26e5deb4f50148a148 M 66e97c77eaa43ab3a2cd95f0edc6a27e7445e8ce M 6becb31c62ef0845a5078f4ec2124fe7bc264e58 M 6d7985f39b83d28b0ca3e485be8de8f986d6f6c1 +M 70a6f989e7062121a73ccdbc686dea4025d41f55 M 7228709bff3fe66626830b0018547d001588da00 M 726c0aa641e408a18fa5f4ff82df682d489874f4 M 7304dfbd8f3044d8d46981abf2058c6cb732d219 @@ -531,6 +548,7 @@ M 8aebfa30047f32e3a6b4feb7ffdd89208ec4f435 M 8b78d8c82accc1f0beca55eef8d5bce87c7af792 M 8c6401b76ca76010e7e169656fd2f5fae6f3245a M 8dadf3defb43d13169943b191204be93da63c88b +M 8dbc8cbfa532706ec138c3580543d38ee5c34daf M 8e131133c8566a124605cb06e0b6db98fddb5972 M 8e650cfe3efd63a06c25b7e912d9d4db61598eb1 M 8f8e587cde7ec97410da6b0586810ccf8f0f3233 @@ -540,6 +558,7 @@ M 8fc9d782901adddf874fe7c2f9500836a0585707 M 910f37767518832cce843c2a093ee833b7c48916 M 91bb2a18f4653f997e455c5089e7a009310591c6 M 939a75d9d3dbfbe37ead5ca41e5e53727dc40b40 +M 93b07cfd3c39f6eb62ec1f428174811a87307ba2 M 94060fc026b3b7214337c9fcfce71c06f0fb4444 M 955fd4b7fee79642934a828b7758ce14f783364a M 97b20f61bbf7054076c8cdf609beb8a7047105b8 @@ -564,6 +583,7 @@ M a644c5d06c0bae321e2c669efa0cecf3abdd944d M a71508214a7682c6a569075b1395f387c31be63b M a719adccae8500f2d7e7140a9f4cd26e20775818 M a7d5d525c05cf10a6ae12c25645c248d92dfac1c +M a876d164c96acc9d08855e9fc6c5fd4ed281845f M a89ca98653b95bcd2ab5cadbe9a419a4cec4893a M a93f0d9ad891865cc635a961cb890c2031177e5b M a9fe8470ce9522f08c298e58f76636c48d57b7a4 @@ -575,6 +595,7 @@ M ae3ae2a25109375cc82114d15078f04e8c5353c5 M b0a79aa7b48da6acdc6da1169abd690ecf914ca8 M b12d8a04f280d39e62a18fa4a8f7946c27f06d75 M b1c6125f50b294b0e2ebc927671e2ff53b5001bf +M b1dae426bbc0209f762a2714e809b50e2d043cf2 M b2b6f0137cd9f1bafff5d487e8383453692a2ff0 M b2e5fb6583d64deeb8a42d2eeb6935c5f33dc0c6 M b30d620d90593f52b79ae578373597defc89e80d @@ -585,6 +606,7 @@ M b4b2da7507aa2d6461156089bd826c00f0bc5360 M b624c034c5682b54b9faf3d3e90eb0c23cde1a5b M b77e43f19d631d94032740eff6e58f49e0532d29 M ba0573f202208b5e3feb881173d3df0dfc2a02ba +M bba922fb4dca56ea4f9ba641d9456e43dbfeca47 M be2bf8d644887fc1853210b9b82db897c4d73dd0 M be99c53015cb37a692d2e4dbe3682c7407f29b99 M c01c68ddda10ec6db492b86d818498bec0bf4228 @@ -619,6 +641,7 @@ M dd421381bcf61ead2a66311f1caf9ebdfcbf06c4 M ded06c40ba057981e003903faa93beb94cbe11fa M df3854cefae5d2da71f8d222a86218e81df7bd05 M e00b84269aa8112bf4073b69b58f933fda3ab497 +M e0ace3dc71a45a9bee6223e550f2ad869581c12d M e0ed46f9f99ac1ec3e0925b3e5666e0b7a69af53 M e4cb2ea437185caa28b95a2344ffa8aa0ba516b7 M e578ea946aa13177adef98727e3e4606652ffc76