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 8925717A20 for ; Mon, 13 Oct 2014 16:33:19 +0000 (UTC) Received: (qmail 68089 invoked by uid 500); 13 Oct 2014 16:33:19 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 68021 invoked by uid 500); 13 Oct 2014 16:33:19 -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 68011 invoked by uid 99); 13 Oct 2014 16:33:19 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 13 Oct 2014 16:33:19 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id E6F3C90DB40; Mon, 13 Oct 2014 16:33:18 +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: git commit: Recording .gitmergeinfo Changes Date: Mon, 13 Oct 2014 16:33:18 +0000 (UTC) Repository: cxf Updated Branches: refs/heads/2.7.x-fixes 584a3aa81 -> 59716dd9e 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/59716dd9 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/59716dd9 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/59716dd9 Branch: refs/heads/2.7.x-fixes Commit: 59716dd9eca2f4cfd83040fe1dd836e5dcb8e8c9 Parents: 584a3aa Author: Colm O hEigeartaigh Authored: Mon Oct 13 17:33:09 2014 +0100 Committer: Colm O hEigeartaigh Committed: Mon Oct 13 17:33:09 2014 +0100 ---------------------------------------------------------------------- .gitmergeinfo | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/59716dd9/.gitmergeinfo ---------------------------------------------------------------------- diff --git a/.gitmergeinfo b/.gitmergeinfo index 28b5413..d439cc4 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -522,6 +522,7 @@ B 5753513fa33edafda8730b9e275865d777c2926c B 57afcdbeadb65078c5a77b9b272776aa99e75fc6 B 580cfc898849f843ec4a14c36cdd9546fb68fb62 B 5885d6be3fdb3b9b38a4d9d753e927424f20096c +B 588ab66d81542398b1ec54cf30884ce3a3742a29 B 58b7407570c2dc0321ab004e41cfd6dbd461e38d B 5934b2e83315c1ccfe1f26d21e3f62d190bab380 B 5947e596913a409f560c1c5db75c73d044f1d8ca @@ -1225,6 +1226,7 @@ B d3fa179ee5131353aadfb0348a2a0ed5fa3c2411 B d48dd9082e58fd3e3ddfd067ccc287bef402f333 B d4ab2f9bdf294e74c5e74a77df34aaf770642787 B d512d5273b747e970448730bcb10b867bc3abdaa +B d54014582e89550ba02b033dcc0d4aa6ca412f90 B d57fd7f2c1c897afe619f81cf4694967ee21535e B d5c72f876b1c34a41d93f07da546b906d1ed0d3a B d5e5211301d67aeaf81d078cb2fc9b76478e555f