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 DBB72106AA for ; Sat, 22 Mar 2014 00:49:59 +0000 (UTC) Received: (qmail 14706 invoked by uid 500); 22 Mar 2014 00:49:51 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 14544 invoked by uid 500); 22 Mar 2014 00:49:47 -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 14425 invoked by uid 99); 22 Mar 2014 00:49:46 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 22 Mar 2014 00:49:46 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id AC3429486FB; Sat, 22 Mar 2014 00:49:46 +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: Sat, 22 Mar 2014 00:49:50 -0000 Message-Id: <64c92e711fdd430d876e64ddf8bb0f6a@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [5/5] 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/3198290d Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/3198290d Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/3198290d Branch: refs/heads/2.7.x-fixes Commit: 3198290d25e84f8e423a00a3b15e99fdf9f7957c Parents: 15da15c Author: Daniel Kulp Authored: Fri Mar 21 20:49:06 2014 -0400 Committer: Daniel Kulp Committed: Fri Mar 21 20:49:06 2014 -0400 ---------------------------------------------------------------------- .gitmergeinfo | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/3198290d/.gitmergeinfo ---------------------------------------------------------------------- diff --git a/.gitmergeinfo b/.gitmergeinfo index 75cfa28..f5b1869 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -961,6 +961,7 @@ M 086b11667b96dec701f592ae2925bfa5de7ad647 M 08d5e152f7c90995bdd336f67c9fe772190e198a M 0a2e01f228890abba0bde43a545ea046c9c46119 M 0ad59e8757cd183484053ae7d61995266b2f4760 +M 0b21c66dc0486643f481c9cf31757e2b3293de23 M 0b3894f57388b9955f2c33b2295223f2835cd7b3 M 0bbd3da675bd37691bb5bb247fa9ec186dcec45c M 0c402ce8092cd9bf9f3390434c56414140267c16 @@ -1221,6 +1222,7 @@ M 95880ccf7e3a8a0be4214f79e711ee533eb10326 M 95fe72099788683e1b079f5827a6c5dc42b3099e M 962f67f6380a17a5d2001604868e5322ef7a16c3 M 97273f5e419efacdb41b9945f1ba1787871a5026 +M 976e6e6edbfeb575c58a7f75f33ca69ea3a5c896 M 97afa21c40d0e3997100e107f33b523b297fa949 M 97fc83f83f4f252d8b759b5b983af624f77266f4 M 9893ce9d05456b7cdf95beac70fd56d29c2c6f08