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 EC7B710A19 for ; Thu, 20 Mar 2014 20:08:19 +0000 (UTC) Received: (qmail 23040 invoked by uid 500); 20 Mar 2014 20:08:17 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 22945 invoked by uid 500); 20 Mar 2014 20:08:17 -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 22937 invoked by uid 99); 20 Mar 2014 20:08:17 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 20 Mar 2014 20:08:17 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 637D9986CD2; Thu, 20 Mar 2014 20:08:17 +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 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: git commit: Recording .gitmergeinfo Changes Date: Thu, 20 Mar 2014 20:08:17 +0000 (UTC) Repository: cxf Updated Branches: refs/heads/2.7.x-fixes b0e1987c5 -> a3e3b776c 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/a3e3b776 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/a3e3b776 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/a3e3b776 Branch: refs/heads/2.7.x-fixes Commit: a3e3b776cc31ff2b50fdfcbf3a5574291f1be2de Parents: b0e1987 Author: Daniel Kulp Authored: Thu Mar 20 16:08:05 2014 -0400 Committer: Daniel Kulp Committed: Thu Mar 20 16:08:05 2014 -0400 ---------------------------------------------------------------------- .gitmergeinfo | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/a3e3b776/.gitmergeinfo ---------------------------------------------------------------------- diff --git a/.gitmergeinfo b/.gitmergeinfo index 128e13f..db46a5b 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -692,6 +692,7 @@ B b95949f1234d38622fb03373e5ac9b6acc550721 B ba3ffb12d7c745e757c0c585268c5ae95e91afeb B ba6e36261f7ceb37eabbc777ab45baf26e5cc2a9 B baa7e247de7cb66f5c89140a6eb6bf72ff91e620 +B bafb95358cf7422108be1e92020b0b6606c29880 B bb0f33bf08d59c85940280ce5071a5856686781e B bb257ca5573bc1e23760e9fcb8c899406aab50e1 B bb2757c945ea3bcd93d321782fb4df39aaadd133 @@ -1376,6 +1377,7 @@ M ebc3eb2a445616c137e998eec7b00cb084332092 M ebd2889e35dddb29935436e0bc3b8b2560b9e23f M ec7720ebed702684d3cd4b47e95f6cc1a81a6983 M ec8393ef9cfde228430def55a185914ba07d8024 +M ec8538e7c5db62ff475bb5ab9e517040e1a4655f M ed0c4b5174e678add4e76ca47cac6f6c29187837 M edac8fb6a9cc5a30ab51b690a528cbeee7672676 M ee1f72412d8dd299d3bdccff7df25124c2d227c3