Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 0C39918153 for ; Wed, 16 Sep 2015 18:16:53 +0000 (UTC) Received: (qmail 69036 invoked by uid 500); 16 Sep 2015 18:16:43 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 68975 invoked by uid 500); 16 Sep 2015 18:16:43 -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 68962 invoked by uid 99); 16 Sep 2015 18:16:43 -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, 16 Sep 2015 18:16:43 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 53F67E024E; Wed, 16 Sep 2015 18:16:43 +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, 16 Sep 2015 18:16:44 -0000 Message-Id: In-Reply-To: <1bb4dec39cd643cc88eaec2e958fd2b8@git.apache.org> References: <1bb4dec39cd643cc88eaec2e958fd2b8@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] cxf git commit: Recording .gitmergeinfo Changes 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/67f8c947 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/67f8c947 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/67f8c947 Branch: refs/heads/3.0.x-fixes Commit: 67f8c947e4a8cccd1ed6ee884f83aa62d5a9fce2 Parents: 80c3ac6 Author: Daniel Kulp Authored: Wed Sep 16 14:16:27 2015 -0400 Committer: Daniel Kulp Committed: Wed Sep 16 14:16:27 2015 -0400 ---------------------------------------------------------------------- .gitmergeinfo | 12 ++++++++++++ 1 file changed, 12 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/67f8c947/.gitmergeinfo ---------------------------------------------------------------------- diff --git a/.gitmergeinfo b/.gitmergeinfo index 8fe7596..6f9139d 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -26,6 +26,7 @@ B 0ff6a3c8609507351d29903d04198fd71b650ae5 B 11243052a6e1656657776bc3a0c586cba962c49f B 1214338f24a3a7973f2bd72ca01fc57644bcc45a B 12d7631bb74f7034c2635f1f253eef79b0fae0ca +B 131c1febfce98364435a3dc5567be89188ee1bda B 131c3fdba9c4825b739adc3d149d0297175b8a86 B 13b9b012a31fdf1a7e35757a336fecc3c688848e B 13dfe0f9fcaa0aee4c603072436d85861a0ab734 @@ -70,6 +71,7 @@ B 28e185b27e8c80cd773cac46d1b9b19529c4fab0 B 28e8f04af96d3e353f0da5018a4531d45592c663 B 292fe2541e32bb31a59955975972cd6adfa1a9dc B 29f0620a9a025afcd2057cdf97c7d93caf6c179f +B 2a2ed67576b525f9708fcb8bd9e8387a277a1f4f B 2a5d201be1b85344585094d0f044e9bf1b605fac B 2afb9d3cacb299bea854d1ff4824e4c981a41d6a B 2ba77327488a8446e6a92af137f644eaf3b06e2e @@ -146,6 +148,7 @@ B 4fe7844935f9b4ad797760613d143949f9448905 B 5015c0c1ccb3bda0d83570c8b0e9889900d68221 B 504b427081cfc2213ce0a5c050b16af67ca7ff46 B 51f433d54a1d11eac25c32b0dd69f12fef62c060 +B 53790b4670bc17af3fd101b01aff7b62d52fac03 B 54508131155cc71099f6f54c5ee531e159d79ca2 B 5577461dfa57cb8c7c49d788276afbd9253d81c5 B 557dc292f63176ba971ebc8c8e23e1fb74c5c4a1 @@ -153,6 +156,7 @@ B 55bda33699ea1c2e84a125253edd594cc2a32ea3 B 5743d5e9bf547bcd0066b2369adadcbb5a8bacbd B 577ccc51c269c66e7810eb4aad9f93cb23c78f8e B 578a51c1ba7f12b35730b0d66ac6b4ab880fb94c +B 587b85261f83306ccdbbc5e0e176436f7991a28b B 5891c0d23b776d41be02e74a3b98a3881970d08f B 58d5200bdc0f666615e99f1c624c53299120518a B 593525139909e081ae809278d301688c0ba03697 @@ -261,6 +265,7 @@ B 92c4738f9e6b96fe0ce8586bb36b9c6444d6e225 B 93039ab86bea4f2bdac4e5eec4229d3271f4c7ec B 9344b093b8081a68c9f83f0c740d60508e99fd5e B 944eb0ba1043bd4daf9cf087b66bc9cab10b8ff2 +B 94a6c24399cfa0326edfeb669c770adee6f9c773 B 94cfe7e48a50104b22457aa47b39d06329d16d32 B 9511cd40a9701ee1b46ba28b61154f6f0833b7d9 B 95c3d899174e39263a773e89a22efbd40be77d4b @@ -303,9 +308,11 @@ B a79bb058aaf71e85dcb5c90e7b2f6e4ab8e63cba B a7b79ea692add4f9da0f1232e3bfb338099f4147 B a7c6e78b491c4feb6797a6dddd32a6249189a552 B a892678e5e2976d0c46ccdc44acb303e855aad9a +B aa0263a09466130dab9ed36a0293ed245ab9b233 B aa5ef9fc7ed198021a246f99429d00863f336948 B ab3817f5068d88c60dc15ce52504435f9b715c1b B ab4eaac0be87291b7f053d144dc8fbf9d98634c3 +B ac33a5b83e2c487a4e7c08c6c15539e64ceea24e B ad5763ef8ea1ff3c8ddea2c3a6fabdaae6acddd6 B ad700a5f6471f55680821f6d04b182f5d3a6054e B af100a919178b0938fcc04d9c8d1dd1269e351b9 @@ -320,6 +327,7 @@ B b1f19a1962d3791211ce83038e8641598c6f5ccf B b248d091551456c2fa8cfe0530dfdfc3632fe5e4 B b4536602d376a36bcbd02d21d5ab42f19d4e5b22 B b4872363fda49f205001d4385ecbc35133c2c755 +B b48c79cc187d16a81e45be8a24e56437a0df56e3 B b54fe0dfdf3c3d76df1e07fb3686d5d8a1061d48 B b5fc90f09c6b039a54564e0825a264310453c550 B b67537dbace0896073b55b375b8ccdc4cce83365 @@ -332,6 +340,7 @@ B bb0a94734f583e5b6b1e42303aa6ba7a49958f18 B bb1edc5dd96c50ed2c3294f6834310e0a6d4381e B bb9b5d2e15c0e30d12a6dea3db1a6f720aaf07ad B bc752dc5bd89b5d70d00435fc1185e72659d7e4d +B bc9e3714adc8848f37694eea62d33748b01fbb91 B bcf0c9f825a7b8d1c86405403d7c089fea2955c0 B bd94b4c8778e360d538d5acb3f6a3710af92e6f1 B bdd359af4de505f7bbe50bf9990da5788e12fd71 @@ -348,6 +357,7 @@ B c04c27200226b564108b4fe58b8ac70ca5ec7638 B c1c9562bb13eeacdd9dae5a46c513e9e03625698 B c2b70fd462955b714f0211ff52e1f99399666d44 B c4c969042edcbcd439faa0fc95c1f5130cf06c71 +B c4ce1dd672146fa49f7d6b0aabc563843828fe93 B c5609a479c87ea75e016b61daeafe0021f693332 B c5da4140da8fe63c4a10845b95258bbda9ab2058 B c750e54452bfa4cb9b0db018dad135b298847095 @@ -422,7 +432,9 @@ B f4aafc6f8fe4e4964f6a48a50c43ceee3a171a64 B f51fb332753e9600a6b6e6dd17b42c1a1494395a B f5655d81ea6a880cf6b8b1cdcabddf1cd4dbe869 B f595ca026d56ec5e58a38780677598d8f9d9ded5 +B f68d734e375174773fd411804d12b04fef2bc011 B f71738d894d4143ed57b956ef1dd68aec5b1b41d +B f727886402155288edcb5882b8b08c8a53b583cf B f7a091afedbc7ca809a7205d7c053a1f5386865e B f7a64ca9f12fa2523c35bc5add4be3e979a7604f B f7c91cac615d7d46b64a7c2b5c1bb6dc515e2e8d