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 39449109F0 for ; Wed, 9 Jul 2014 15:57:06 +0000 (UTC) Received: (qmail 81234 invoked by uid 500); 9 Jul 2014 15:57:06 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 81174 invoked by uid 500); 9 Jul 2014 15:57:06 -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 81164 invoked by uid 99); 9 Jul 2014 15:57:06 -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, 09 Jul 2014 15:57:06 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id D71189A9C2E; Wed, 9 Jul 2014 15:57:05 +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: <9109602d747a48a184ffdefe8b74b85e@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: Recording .gitmergeinfo Changes Date: Wed, 9 Jul 2014 15:57:05 +0000 (UTC) Repository: cxf Updated Branches: refs/heads/2.7.x-fixes 9c11b61bc -> c61bff324 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/c61bff32 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/c61bff32 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/c61bff32 Branch: refs/heads/2.7.x-fixes Commit: c61bff324caed93317bdd07cbb0849456e049c63 Parents: 9c11b61 Author: Daniel Kulp Authored: Wed Jul 9 11:56:16 2014 -0400 Committer: Daniel Kulp Committed: Wed Jul 9 11:56:16 2014 -0400 ---------------------------------------------------------------------- .gitmergeinfo | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/c61bff32/.gitmergeinfo ---------------------------------------------------------------------- diff --git a/.gitmergeinfo b/.gitmergeinfo index b23c3d4..7def845 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -78,6 +78,7 @@ B 0fcb49380d93b974e918e32051b5438cdc5e179c B 0fd41e29ea4a79d7dd44569db6c804c5b257085b B 0ff365aa8bb9b7b2180dbf1afd17b4cc39020f40 B 100bf13fe2cf118167f0d0aaf02c34e6337c12ec +B 1075d1f4775b02fe7305d9b71379a857dd358fca B 1138017fa68e60f5920c48d4cce39632af6067c7 B 118eceb436013ae2c2f94fa3dfeadc615149a0e8 B 11bccec4f48f65f36907cd04230b1b751a34d0e1 @@ -1091,10 +1092,12 @@ B f32709f86d7f1aefb23a60c705d6d658d7b958e2 B f34899128e0e27850a3cc31bbf58658290931506 B f3497b00bd89e2978d605425c98f93fd310f442e B f360f14089d616160553b1ea336c0d51a0206443 +B f372fffe46870f44ba491afbff1807d4a8799b75 B f42f6b6ba6037850bd200923b72fd3e716ccbbff B f45bfa1b92dac579d570b86d20fdbfe6ac4b5feb B f47125823394579b307d8dbab89fc6cdb38e8c80 B f4c0d943011197b0223607959104983a5f8d87e1 +B f4ce90b50cf2ccd771d05f5c5c0bcf76341744e3 B f4e85ce1f779e95b8bad25450523e9c35b383bf9 B f4f4ddaee93e441843b481293e08a4686505116a B f4f50aa0412bba172fd0f5ebb3e73eb6457c3812