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 3817C1161A for ; Wed, 23 Jul 2014 20:20:38 +0000 (UTC) Received: (qmail 30682 invoked by uid 500); 23 Jul 2014 20:20:35 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 30611 invoked by uid 500); 23 Jul 2014 20:20:35 -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 30579 invoked by uid 99); 23 Jul 2014 20:20:35 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 23 Jul 2014 20:20:35 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 4D7EC9B1E7A; Wed, 23 Jul 2014 20:20:35 +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: Update to pull from 3.0.x branch Date: Wed, 23 Jul 2014 20:20:35 +0000 (UTC) Repository: cxf Updated Branches: refs/heads/2.7.x-fixes 10199c1e3 -> 7b42f0cea Update to pull from 3.0.x branch Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/7b42f0ce Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/7b42f0ce Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/7b42f0ce Branch: refs/heads/2.7.x-fixes Commit: 7b42f0cea5992ff1e2e54ec215f31d9318bce340 Parents: 10199c1 Author: Daniel Kulp Authored: Wed Jul 23 16:18:35 2014 -0400 Committer: Daniel Kulp Committed: Wed Jul 23 16:18:35 2014 -0400 ---------------------------------------------------------------------- .gitmergeinfo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/7b42f0ce/.gitmergeinfo ---------------------------------------------------------------------- diff --git a/.gitmergeinfo b/.gitmergeinfo index a5a9cb3..c7d1232 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -1,4 +1,4 @@ -origin/master +origin/3.0.x-fixes A core api A core rt/core A rt/wsdl rt/core