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 0428210417 for ; Sun, 6 Apr 2014 01:39:29 +0000 (UTC) Received: (qmail 68654 invoked by uid 500); 6 Apr 2014 01:39:12 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 68451 invoked by uid 500); 6 Apr 2014 01:39: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 68435 invoked by uid 99); 6 Apr 2014 01:39:10 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 06 Apr 2014 01:39:10 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id B839194B538; Sun, 6 Apr 2014 01:39:10 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dkulp@apache.org To: commits@cxf.apache.org Date: Sun, 06 Apr 2014 01:39:12 -0000 Message-Id: <5d6eceb9303c49fcaa3415ae768b160b@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [3/4] git commit: Recording .gitmergeinfo Changes 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/03ce7678 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/03ce7678 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/03ce7678 Branch: refs/heads/2.7.x-fixes Commit: 03ce7678eb104592ca775ea17de091b72af0ee11 Parents: 0f212a3 Author: Daniel Kulp Authored: Sat Apr 5 21:38:18 2014 -0400 Committer: Daniel Kulp Committed: Sat Apr 5 21:38:18 2014 -0400 ---------------------------------------------------------------------- .gitmergeinfo | 4 ++++ 1 file changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/03ce7678/.gitmergeinfo ---------------------------------------------------------------------- diff --git a/.gitmergeinfo b/.gitmergeinfo index ad73e90..46ad729 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -13,6 +13,7 @@ B 0146d65aa1aa2681d358928f8e4ac918bf2b0305 B 01ad820abd4d4dd172c1c6b19bf5a93f828decfe B 01c79cfc4f335477d3460729782cc243d6f55196 B 01f06dc19334b42c83efa839643a99c9502b3e5a +B 0213b00013706d9e7fa0418a035819ab8e5af5f1 B 024f503cb739eb800b672f7f87b846350f7abf45 B 02ab1002aaca0285f1f600ea2b0438defc8274a9 B 02d40450239d978d477b3ec63714c427c588e553 @@ -376,6 +377,7 @@ B 60e756d2dc7507716d8b8fa2bfd9b99fc3e2ce73 B 60fec6d7fddaa8324fc9652c6b7cbc100fa31822 B 61145ca9fe23be1c9a88570926308e30b276c5c1 B 6166f14fd666e8c499a789b4dd18a02a67121059 +B 61cad675f562b1a5f28d62c7929521e18e0153ee B 62144e297cfd175addf57671e71773cc6a602340 B 6241186c4e4ec1c14ff467884f83716fe6e2e2c7 B 625e54cb8ef4bd4c06f3c25d9cbb1b0bc53e83c1 @@ -1062,6 +1064,7 @@ M 1cb8ea77bd878b694dbb739d2e08bcbe3e8c62df M 1e7c47d8d989d0f0206c8d4c1b11ef8638d5c3d6 M 1e9e67d778ed81d9adbce3b0d3cf61ab1e8d4a38 M 1ec43095d4577dea6ba76d5a4085a07de8bfae92 +M 1ed0dd8ba34164e462f160fa3c7864ac12aeb9f0 M 1fa9f532b64187ac7e7f1094b659369fc4adacf6 M 20767c663fc54d3f6d0219a5c347dbaa49939b67 M 20b023d463d322b30067306acdd7b4e46292ba68 @@ -1325,6 +1328,7 @@ M a326d844d4568f418888f28fbb23e56020eb8ef0 M a3b3e7015b68d0247c4ab7c3c3e5d7457f464186 M a3d2c08f3c492e294f4f18bf6925565a97295ce4 M a40358aedb488fdf517955ead872d0f832625ec6 +M a4903d384fff5d10d24400750522e07dd158970a M a4a5b4fb19362f33b5b1255aff61d9edf51628a1 M a5272604a833f7fb53514428ef04a3bc9a550e79 M a5b6a887d813d793a6b236162ff85211c35759ab