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 DF3AB17E3C for ; Mon, 27 Oct 2014 19:48:23 +0000 (UTC) Received: (qmail 84321 invoked by uid 500); 27 Oct 2014 19:48:23 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 84153 invoked by uid 500); 27 Oct 2014 19:48:23 -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 84129 invoked by uid 99); 27 Oct 2014 19:48:23 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 27 Oct 2014 19:48:23 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 5F317984052; Mon, 27 Oct 2014 19:48:23 +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: Mon, 27 Oct 2014 19:48:25 -0000 Message-Id: <83b578592b144b0ba99e99ebe10ff6e8@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [3/4] 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/01d7f1f3 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/01d7f1f3 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/01d7f1f3 Branch: refs/heads/2.7.x-fixes Commit: 01d7f1f3ec19d7c375769e744180fbf0191baa9d Parents: fe24026 Author: Daniel Kulp Authored: Mon Oct 27 14:04:23 2014 -0400 Committer: Daniel Kulp Committed: Mon Oct 27 14:04:23 2014 -0400 ---------------------------------------------------------------------- .gitmergeinfo | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/01d7f1f3/.gitmergeinfo ---------------------------------------------------------------------- diff --git a/.gitmergeinfo b/.gitmergeinfo index 8053328..dd27357 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -1430,6 +1430,7 @@ B f206aab7a0b641388e608af91866b5ddb317bdd4 B f2284040e8269ae8fe4cabe54b1b916abd26016d B f28f777f7a4cd31c32fa08d26fc7892e4bc1f89f B f29557a3b144603eab65068b6776d823683dab87 +B f2bc4d4315ad661284946e3cd213d8e5f7cdd715 B f32709f86d7f1aefb23a60c705d6d658d7b958e2 B f34899128e0e27850a3cc31bbf58658290931506 B f3497b00bd89e2978d605425c98f93fd310f442e @@ -1949,6 +1950,7 @@ M a3f7f142a17da0d0fecd4fa039c07ba6e2496d49 M a40358aedb488fdf517955ead872d0f832625ec6 M a4903d384fff5d10d24400750522e07dd158970a M a4a5b4fb19362f33b5b1255aff61d9edf51628a1 +M a4d82fe2908471335bebd85a88728605aff15084 M a4e4ea126e7f68d4f7c5de02aad5eaab50ac2a96 M a5272604a833f7fb53514428ef04a3bc9a550e79 M a5b6a887d813d793a6b236162ff85211c35759ab