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 F0347172C5 for ; Fri, 10 Oct 2014 15:08:48 +0000 (UTC) Received: (qmail 58387 invoked by uid 500); 10 Oct 2014 15:08:48 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 58324 invoked by uid 500); 10 Oct 2014 15:08:48 -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 58315 invoked by uid 99); 10 Oct 2014 15:08:48 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 10 Oct 2014 15:08:48 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 8F7FA3D6F9; Fri, 10 Oct 2014 15:08:48 +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: <16884c8b20dc40e6a2d1acc633d392a0@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: Recording .gitmergeinfo Changes Date: Fri, 10 Oct 2014 15:08:48 +0000 (UTC) Repository: cxf Updated Branches: refs/heads/2.7.x-fixes c1ca8aec0 -> 54790282c 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/54790282 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/54790282 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/54790282 Branch: refs/heads/2.7.x-fixes Commit: 54790282ca4f348a933ae30d96733bc6e1cd6d08 Parents: c1ca8ae Author: Colm O hEigeartaigh Authored: Fri Oct 10 16:08:38 2014 +0100 Committer: Colm O hEigeartaigh Committed: Fri Oct 10 16:08:38 2014 +0100 ---------------------------------------------------------------------- .gitmergeinfo | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/54790282/.gitmergeinfo ---------------------------------------------------------------------- diff --git a/.gitmergeinfo b/.gitmergeinfo index acd499f..2cb42c3 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -158,6 +158,7 @@ B 19a66ba7cdadc06cad4bbb4b5b2d61d8b19e279b B 19ba5d083a1819af6695aeccdb44503d3dcb3c96 B 19e7643b6c7bab7a01bfaede067aaed5e59008d5 B 1a6a69574c777eccfceec8aad9c043e98b2f2439 +B 1aa01b2efdc6befbea4f786272215bcc28d842e0 B 1aac5314c181a025b6d549b644a82082a615a571 B 1ab29165487890824f9c8d2a53b94e35283a0a8c B 1acfc88090a7fca36194f6f1658375184053bab7