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 B702118184 for ; Mon, 7 Sep 2015 16:56:23 +0000 (UTC) Received: (qmail 82584 invoked by uid 500); 7 Sep 2015 16:56:11 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 82516 invoked by uid 500); 7 Sep 2015 16:56:11 -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 82507 invoked by uid 99); 7 Sep 2015 16:56:10 -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, 07 Sep 2015 16:56:10 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C237AE01FC; Mon, 7 Sep 2015 16:56:10 +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, 7 Sep 2015 16:56:10 +0000 (UTC) Repository: cxf Updated Branches: refs/heads/2.7.x-fixes 17ff5b787 -> 3124e094c 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/3124e094 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/3124e094 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/3124e094 Branch: refs/heads/2.7.x-fixes Commit: 3124e094c788b73baaf8726235c5493fd82ec5dc Parents: 17ff5b7 Author: Colm O hEigeartaigh Authored: Mon Sep 7 17:55:47 2015 +0100 Committer: Colm O hEigeartaigh Committed: Mon Sep 7 17:55:47 2015 +0100 ---------------------------------------------------------------------- .gitmergeinfo | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/3124e094/.gitmergeinfo ---------------------------------------------------------------------- diff --git a/.gitmergeinfo b/.gitmergeinfo index 62d5fb7..cffb906 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -79,6 +79,7 @@ B 080bd762e7e09f7fe1d1fa2d7c55bc6626f539d9 B 0877b2a7bfc496b6d8d57083abbee2fbfd50c221 B 0885ab9c1e8e11a217214473255bfae817c92261 B 089343fe8e895c7d348158787468082bb62ef668 +B 08d1696db5290e00b82ee42ac72fe40383028cb6 B 08f29acf03e6aa1b227bf4c12b1c76c64d31c625 B 08fbe43f26280f9d0724dfd099e7b49e13fadc17 B 08fc8aadb9e886323533b657604912b33246efe9 @@ -1032,6 +1033,7 @@ B 7215e8683cbd61efbba96438c9c871aa49c3e5e7 B 7217132510a1fb1b3d27a1bf72db683f786fa00f B 72287e2764a309412025fba0a27ce4acbfe96203 B 724458f5417b0fad261dc9db0a7dc32e749062ae +B 724e55fe1bbc0f79764c7801d484f205758a9546 B 728590b437c9decb1561b60fbe95c712fb3fadf6 B 728a647a21486b8dd5e2adf4b0242a9abc014e0c B 7294ff05b25d1388128b8a546d47a6ebe61ffd61