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 C0AFC1857F for ; Fri, 28 Aug 2015 12:52:16 +0000 (UTC) Received: (qmail 99478 invoked by uid 500); 28 Aug 2015 12:52:16 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 99415 invoked by uid 500); 28 Aug 2015 12:52:16 -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 99406 invoked by uid 99); 28 Aug 2015 12:52:16 -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; Fri, 28 Aug 2015 12:52:16 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 6C1C7DFFAB; Fri, 28 Aug 2015 12:52:16 +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: X-Mailer: ASF-Git Admin Mailer Subject: cxf git commit: Recording .gitmergeinfo Changes Date: Fri, 28 Aug 2015 12:52:16 +0000 (UTC) Repository: cxf Updated Branches: refs/heads/3.0.x-fixes 3ce7b636f -> f3d875215 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/f3d87521 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/f3d87521 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/f3d87521 Branch: refs/heads/3.0.x-fixes Commit: f3d8752156de16b0686b4dd34935ba20187f3c5f Parents: 3ce7b63 Author: Colm O hEigeartaigh Authored: Fri Aug 28 13:52:03 2015 +0100 Committer: Colm O hEigeartaigh Committed: Fri Aug 28 13:52:03 2015 +0100 ---------------------------------------------------------------------- .gitmergeinfo | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/f3d87521/.gitmergeinfo ---------------------------------------------------------------------- diff --git a/.gitmergeinfo b/.gitmergeinfo index 8180c00..f54cfd3 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -225,6 +225,7 @@ B 7e82d2f10a1ca14a939d2c63ca4e620f8870e256 B 7e8d0b4b1cd868272380ca5779e67a15e46cf799 B 7e95279dd1170f5878687d7eea27f7d7f03a434b B 7f7cc3c390b95f9d7589eb192538551416c313db +B 7fbbd1d13bbb7ccbbc1213ed86a456794583fd3e B 80014cf0e6fb1ba62ffdb3766acffd2130eef9d6 B 80d7128a3ba1944a603c73e5e908d86c9bf27648 B 8176b1b0faad2de44a4ff85083c74b5a4b74918a @@ -250,6 +251,7 @@ B 8ee1ce727f04099b2bbeea4164ad38005de769b3 B 8f967643447ceec89e58b079d8d8fc00cf232a02 B 8fd8c552f4c2a980a5138de19a2b74104776a4ba B 90312bc48f6e564bcafdaaebc3cd596c966ee674 +B 91c7b09005e8d32187283828ac348235b725e3e3 B 91d6630c53f222544e4bb512fb5c918d68518138 B 92502a5e2af6e5d3c544f89396de2d05d539fd41 B 92c4738f9e6b96fe0ce8586bb36b9c6444d6e225 @@ -403,6 +405,7 @@ B eba07e615684e475772a7a2d23d7e93a0b099485 B ec3a49b094019544e525aa1b14f494ca3217f17b B ec4435d70cb0097e34f38bc0f47c0faca03b4bb0 B ecbf4e78586870a507fe4cf91239d51c3f202aad +B ed0f25116f8620841ff96dd1b751d97c11eb09c3 B ed18c008f05af7063d5929d072b86048d12dab4c B ee64acf5f8370cd1e33719e4d9d4e9922e386602 B eee2a947d867c403c212677cf942b3d07fa06fd7