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 85F3717780 for ; Thu, 22 Jan 2015 15:42:09 +0000 (UTC) Received: (qmail 23480 invoked by uid 500); 22 Jan 2015 15:42:09 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 23415 invoked by uid 500); 22 Jan 2015 15:42:09 -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 23406 invoked by uid 99); 22 Jan 2015 15:42:09 -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, 22 Jan 2015 15:42:09 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E3849E03A3; Thu, 22 Jan 2015 15:42:08 +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: <670ee608b32e4df7b9b29eece74496dd@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: cxf git commit: Recording .gitmergeinfo Changes Date: Thu, 22 Jan 2015 15:42:08 +0000 (UTC) Repository: cxf Updated Branches: refs/heads/2.7.x-fixes 0e42f8e57 -> 6a79c3614 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/6a79c361 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/6a79c361 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/6a79c361 Branch: refs/heads/2.7.x-fixes Commit: 6a79c361496ca862783f924f52113a22314faeb6 Parents: 0e42f8e Author: Colm O hEigeartaigh Authored: Thu Jan 22 15:42:04 2015 +0000 Committer: Colm O hEigeartaigh Committed: Thu Jan 22 15:42:04 2015 +0000 ---------------------------------------------------------------------- .gitmergeinfo | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/6a79c361/.gitmergeinfo ---------------------------------------------------------------------- diff --git a/.gitmergeinfo b/.gitmergeinfo index e4d5bc7..55f01a0 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -1042,6 +1042,7 @@ B 99674f2f92a1fe03a7cf71d14a91b8b5ddf8f1e1 B 99a0584b7c483844cab66e231cb8ffa559ea7cf9 B 99c47519ffbf30335559f8c32d222314ff6ea438 B 99ce97ea9c976d5e57cc79b4b26d9b10a3bb4eaa +B 99fc7e1e5d5900a547a0c992102c100f69e918bd B 9a20282e40c3d60d03871440d0b14ee02d3f0a32 B 9a258338bef4c952db0fed6dfa108279c34a4630 B 9a2fe574c337173cf02bb87aca33bb232a544f70