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 1961E18895 for ; Fri, 5 Feb 2016 20:40:25 +0000 (UTC) Received: (qmail 26568 invoked by uid 500); 5 Feb 2016 20:40:24 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 26492 invoked by uid 500); 5 Feb 2016 20:40:24 -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 26477 invoked by uid 99); 5 Feb 2016 20:40:24 -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, 05 Feb 2016 20:40:24 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 719A0E0061; Fri, 5 Feb 2016 20:40:24 +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 Date: Fri, 05 Feb 2016 20:40:24 -0000 Message-Id: <13a65bfd9e8e4ecbba9113865a1c35f0@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] cxf git commit: Recording .gitmergeinfo Changes Repository: cxf Updated Branches: refs/heads/3.0.x-fixes 640f3a914 -> bcaa41ad1 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/a0680698 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/a0680698 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/a0680698 Branch: refs/heads/3.0.x-fixes Commit: a0680698c90ddade110fd6b8324609e96baf78fa Parents: 640f3a9 Author: Colm O hEigeartaigh Authored: Fri Feb 5 15:01:14 2016 +0000 Committer: Colm O hEigeartaigh Committed: Fri Feb 5 15:01:14 2016 +0000 ---------------------------------------------------------------------- .gitmergeinfo | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/a0680698/.gitmergeinfo ---------------------------------------------------------------------- diff --git a/.gitmergeinfo b/.gitmergeinfo index 14eec1c..6f47eaa 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -451,6 +451,7 @@ B 9896b920035a1d1be1aef28a1d1a5eb876445c82 B 99963f9a08c9782b7c661f2b5ff8e9ce95ab3dbe B 99f4092de01d60b8369ff84036d543e9d20ecefc B 9a2c82620001b76a2065960686f9bc8f384c4d58 +B 9aae5c5622dec1198a333ac6bb3508d3ca4634c1 B 9ac66adffb73f3474fde064fab1013ecdd24be7c B 9ae69b3b323f48de033f62be9fc2780f11b0c761 B 9b93ca4bda4ba8abce2e2248059f2ccfd35391b2 @@ -646,6 +647,7 @@ B da53162f385fa73957626446cbd63ea269c1ee26 B db18a965fb238b8515ab74eb63d13c863c279476 B db51e1a99ab886f179c677579ba798b450069287 B dbf8d58d565ba7f3a8c43b917f7e9182cabe5efa +B dbfaf2b5aea3c4b09a825c82cae88c9d5f777aac B dc6fe383b095c6823e5de707b1c091556c9c378a B dc986e411b2f7449d6cd92481431cfebe18689bd B dd3c8f9d05b549d7aeb3804476bdc3fb344cf2d8