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 C116B18E3C for ; Mon, 5 Oct 2015 14:56:32 +0000 (UTC) Received: (qmail 78791 invoked by uid 500); 5 Oct 2015 14:56:26 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 78736 invoked by uid 500); 5 Oct 2015 14:56:26 -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 78727 invoked by uid 99); 5 Oct 2015 14:56:26 -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; Mon, 05 Oct 2015 14:56:26 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 58902E038A; Mon, 5 Oct 2015 14:56:26 +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: Mon, 5 Oct 2015 14:56:26 +0000 (UTC) Repository: cxf Updated Branches: refs/heads/3.0.x-fixes f49d165b8 -> e6c98aae9 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/e6c98aae Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/e6c98aae Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/e6c98aae Branch: refs/heads/3.0.x-fixes Commit: e6c98aae938b78d2b66db838b92c47c6d0833b76 Parents: f49d165 Author: Colm O hEigeartaigh Authored: Mon Oct 5 15:56:21 2015 +0100 Committer: Colm O hEigeartaigh Committed: Mon Oct 5 15:56:21 2015 +0100 ---------------------------------------------------------------------- .gitmergeinfo | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/e6c98aae/.gitmergeinfo ---------------------------------------------------------------------- diff --git a/.gitmergeinfo b/.gitmergeinfo index 7f2c373..32a340b 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -205,6 +205,7 @@ B 6e4f0f60785de1f5774644323edafb4741b9e4a4 B 6ef5be5869eb0c076f8bc8ed30775028a0b314c7 B 6efe475ad57f042ffc9547f1bb258ab4e16a3f3e B 6f3f4c1f873d8d30a4c30165280dd0ff46e03d5d +B 6fb880420de545f7ed09199674b7fec3d0ba4d7c B 702f27bc4a334b2d117262252632bf580f20f711 B 712e96428c926bf8aedce8eb91c33d79801dd636 B 71488c6fa7635c88285214a0479379aafef9ed3c @@ -224,6 +225,7 @@ B 785955e8a26a891296908796abac0b1cf88c94ce B 793f0a7d2a8eade3238deef212dff5f29e0c5b4d B 799c5389f754eb588f023b646b8983b50dde00be B 7a52636862d2d920a2a6d5c5f00821611b7faa37 +B 7b9f72bd7c3dc778da9bee85d54f36f99c0feb23 B 7c8124a5696de6c20ff5837531aff937eedccf0f B 7cd4cf67ba5b8a0ddc36c8008bf096b469408f48 B 7d1f30f76d95f9eddf0bed995120c71bf1a393b3 @@ -372,6 +374,7 @@ B cd809b8526fc5620c481d4ee5a8534ccf6babae4 B cdafd372c60b7e19229d7e6a91fc69b9c5dbc69c B ce81b3829764996aa8d6c006ec2dd5c784e98433 B d021b9041e00518099947274455b2027326a3c7c +B d04f83cecea57d92052f3bf1f4eea7f4adfac6c6 B d0c5c3defab6dbb9619f8fd291f2e06b685cb03c B d1c7f1f6be4ce14bd0e99ec9672d9c1957515f35 B d391d9371d8505c7774308c4fbbb9bc57ffd34a6