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 353DF186C5 for ; Fri, 9 Oct 2015 14:11:06 +0000 (UTC) Received: (qmail 99995 invoked by uid 500); 9 Oct 2015 14:10:59 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 99935 invoked by uid 500); 9 Oct 2015 14:10:59 -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 99926 invoked by uid 99); 9 Oct 2015 14:10:59 -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; Fri, 09 Oct 2015 14:10:59 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 813ACDFCE0; Fri, 9 Oct 2015 14:10:59 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: coheigea@apache.org To: commits@cxf.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: cxf git commit: Recording .gitmergeinfo Changes Date: Fri, 9 Oct 2015 14:10:59 +0000 (UTC) Repository: cxf Updated Branches: refs/heads/2.7.x-fixes 39aa5a83b -> 96ce8edd8 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/96ce8edd Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/96ce8edd Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/96ce8edd Branch: refs/heads/2.7.x-fixes Commit: 96ce8edd8ace7b0564b4bfd8ed5698362c9d889b Parents: 39aa5a8 Author: Colm O hEigeartaigh Authored: Fri Oct 9 15:10:53 2015 +0100 Committer: Colm O hEigeartaigh Committed: Fri Oct 9 15:10:53 2015 +0100 ---------------------------------------------------------------------- .gitmergeinfo | 5 +++++ 1 file changed, 5 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/96ce8edd/.gitmergeinfo ---------------------------------------------------------------------- diff --git a/.gitmergeinfo b/.gitmergeinfo index 63c1783..33e4914 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -104,6 +104,7 @@ B 0b4fe87bb5918f3aa3a99834d1de0a5146bcbb36 B 0b64a5d643c36e7ec5c00268d4f7500d1bd74773 B 0b78fd4c1ce1d12d1b34e8a876b4029ca95cd131 B 0ba5fd4d650ed8601b44a1df1aee421a73463127 +B 0bb08f373f33bc837e697947b0939facd3d1c1d8 B 0bb4d0c5605d7146e75b335316451008ebac2fcc B 0bfee67fff799ffa7845873a4190676763c1c1ea B 0c1056239a1fa3649658d5ce2cf0a64df2cb5fa7 @@ -566,6 +567,7 @@ B 3b85cfaa3e3ede4c2abf977b4c0bbe4ec289c09a B 3b86cbaff51cb6282e10f44be0f4dfb4221506e6 B 3b8844dc381b7806c5899dc01e6b8220376d1133 B 3ba70b45de658b98c96485f10c9f688332d7510c +B 3badd4122826a6e21540a90dab6c938e1abe2fe3 B 3bcf569835e6aac67b53b04c8de9f1d7333a5de9 B 3bd1723a6fa236641b8a07628b505fe755c31f9d B 3bd4e84427598b7dfd18ccfcdea72512bc6cda9e @@ -601,6 +603,7 @@ B 3ed5a43de40791659a5df4a3fa2255c8a1c4d269 B 3ef21c829aa2c8272f87c2d9564011b95a976587 B 3f1542f09664fc185546e24ffb4699233da0eec2 B 3f4fd1c96ed389a7153df630ab01033ad3b350f5 +B 3f53562bd221c3f2ee3f16b13a96d62d4cfa60bb B 3f6e48515f61bfe66cdc489f6ec72cd3cb7aaf26 B 3f7c187b5f8e49787a0e175b34712a78bb18081b B 3fa3231b13f06664b6aaf6b56e3de5738c89a574 @@ -1831,6 +1834,7 @@ B caca7e1138202d15df04278a20426bcf07c04528 B cad58cb4bbb87841fc86b4dae5e2b9fd8e70b721 B cadb4e5a19c568f806b03b72b8712c13688307eb B cae108db6420d77202660d6770fb4777c5951764 +B caff645368ee2dc088ee7ef491e4772e6e318d7c B cb20bf3263f8afc3248c479634a40f4579901186 B cb3b8ba1dd94b3ea8a807862b58cdf6017c16efd B cba9f70068a74ab195c618b681cb45834445aa66 @@ -2001,6 +2005,7 @@ B dec493568f388f2324462d4b7a0148ea4bbbdbe7 B deca47d1ff49f43ecd137f3a1a04e771fe1a7712 B df3aa9d613db902539ebef5b0ef47122c86df034 B df457e9b8f456cc571a5a136ffa6f9bc06219588 +B df50e6497eb3909061b1329899d57ae0c9940aad B df7a7538feb5796c0c7edce929493b64d82442c3 B df8ebc45a913a34d9ac8d0d1c6186d0cfe1c6673 B df94a7fe524549455ec65c3068a39a1d1d37acb1