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 0AA1219A2C for ; Thu, 28 Apr 2016 11:04:04 +0000 (UTC) Received: (qmail 2595 invoked by uid 500); 28 Apr 2016 11:04:04 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 2535 invoked by uid 500); 28 Apr 2016 11:04:04 -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 2525 invoked by uid 99); 28 Apr 2016 11:04:03 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 28 Apr 2016 11:04:03 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id AEB19DFB90; Thu, 28 Apr 2016 11:04:03 +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: <4057a017103c42d2b6c8d9adff9d8a2c@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: cxf git commit: Recording .gitmergeinfo Changes Date: Thu, 28 Apr 2016 11:04:03 +0000 (UTC) Repository: cxf Updated Branches: refs/heads/3.0.x-fixes 4ad3997c3 -> 5e3b5a724 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/5e3b5a72 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/5e3b5a72 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/5e3b5a72 Branch: refs/heads/3.0.x-fixes Commit: 5e3b5a724910e90b5ddd1516642bad367611f09c Parents: 4ad3997 Author: Colm O hEigeartaigh Authored: Thu Apr 28 12:03:58 2016 +0100 Committer: Colm O hEigeartaigh Committed: Thu Apr 28 12:03:58 2016 +0100 ---------------------------------------------------------------------- .gitmergeinfo | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/5e3b5a72/.gitmergeinfo ---------------------------------------------------------------------- diff --git a/.gitmergeinfo b/.gitmergeinfo index e0ddde0..64d08ab 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -481,6 +481,7 @@ B 88adfaf2ad97b4968b0dc47194b29c717b138d7a B 88d513e3a47cc52335e9419da00319cf147eb66c B 88fe618069a5d4f6fe328a76b3fd3e164c7fc564 B 894eef1d106f702f19485a8c6b0147d8d2484677 +B 895f9b0ff0b43f775309bfc5d064ca22ec7b2df4 B 89b7bb172804ebaffaa69c9207065e50eb5a5d36 B 8a82bbfb59141801864e74ebe92f499f117ba6ef B 8a9f6cdafc87a22314c805e995fc5d286fe8beed