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 6478811AF6 for ; Tue, 8 Apr 2014 20:53:48 +0000 (UTC) Received: (qmail 39196 invoked by uid 500); 8 Apr 2014 20:53:47 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 39098 invoked by uid 500); 8 Apr 2014 20:53:44 -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 39084 invoked by uid 99); 8 Apr 2014 20:53:43 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 08 Apr 2014 20:53:43 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 60E8994E8F9; Tue, 8 Apr 2014 20:53:43 +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: Tue, 08 Apr 2014 20:53:43 -0000 Message-Id: <3d617ae2cfaa4fa4855436a4bd150812@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] git commit: Recording .gitmergeinfo Changes Repository: cxf Updated Branches: refs/heads/2.6.x-fixes d5c4794c0 -> 4127f298e 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/4127f298 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/4127f298 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/4127f298 Branch: refs/heads/2.6.x-fixes Commit: 4127f298e515107496ae2caadbf211e443748adb Parents: 7229f99 Author: Daniel Kulp Authored: Tue Apr 8 14:53:23 2014 -0600 Committer: Daniel Kulp Committed: Tue Apr 8 14:53:23 2014 -0600 ---------------------------------------------------------------------- .gitmergeinfo | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/4127f298/.gitmergeinfo ---------------------------------------------------------------------- diff --git a/.gitmergeinfo b/.gitmergeinfo index 8685c22..015b27e 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -158,6 +158,7 @@ B 26d0beb06f9cb1348a941ba38d89883e3a0b181b B 26ebbfa535dabb2f36ef244ca6b6b47507024a03 B 275cb69483cfb87f8ebbee206e240f241f76b531 B 275ecda83e2ecf2d208b28069b4e4ee6466f6d28 +B 277bfdeab6a18078423427ea55fff74e78c783aa B 2812a16c16dc549d0ccd5887a9524cf227a1a7cd B 290f2a7d8625edbb013853c2fe0bc0796e97f6ac B 29336a2d182064df19b02ac459d3e6a96a5b3c5e