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 F01EE17659 for ; Sun, 5 Oct 2014 21:49:00 +0000 (UTC) Received: (qmail 16996 invoked by uid 500); 5 Oct 2014 21:49:00 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 16933 invoked by uid 500); 5 Oct 2014 21:49:00 -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 16924 invoked by uid 99); 5 Oct 2014 21:49:00 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 05 Oct 2014 21:49:00 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 359D381A7B2; Sun, 5 Oct 2014 21:49:00 +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: git commit: Recording .gitmergeinfo Changes Date: Sun, 5 Oct 2014 21:49:00 +0000 (UTC) Repository: cxf Updated Branches: refs/heads/2.7.x-fixes a67624ad2 -> c26d81446 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/c26d8144 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/c26d8144 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/c26d8144 Branch: refs/heads/2.7.x-fixes Commit: c26d8144665bcda2db50858bda8258e8795e11e8 Parents: a67624a Author: Colm O hEigeartaigh Authored: Sun Oct 5 22:48:53 2014 +0100 Committer: Colm O hEigeartaigh Committed: Sun Oct 5 22:48:53 2014 +0100 ---------------------------------------------------------------------- .gitmergeinfo | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/c26d8144/.gitmergeinfo ---------------------------------------------------------------------- diff --git a/.gitmergeinfo b/.gitmergeinfo index 54e225b..c1a9734 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -68,6 +68,7 @@ B 0bfee67fff799ffa7845873a4190676763c1c1ea B 0c1056239a1fa3649658d5ce2cf0a64df2cb5fa7 B 0c2672042482c63a14778f9f062ba52eaa088291 B 0c2a87c0a733efff02a2d09691a51ecf51829105 +B 0c3bd1aa0ff546b1ceab390d622fbc033d32cd24 B 0c77f4ff91451c0bf73ebe1103e99583cc26d786 B 0cab9af902645eb9b72b3225c8271afa6002684f B 0ccdc3930f8f0dcee14140467be83d89c625dc46