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 D88FD11FC6 for ; Tue, 8 Apr 2014 22:56:19 +0000 (UTC) Received: (qmail 30649 invoked by uid 500); 8 Apr 2014 22:56:15 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 30575 invoked by uid 500); 8 Apr 2014 22:56:14 -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 30255 invoked by uid 99); 8 Apr 2014 22:56:13 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 08 Apr 2014 22:56:13 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 491E794ECF4; Tue, 8 Apr 2014 22:56:13 +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: Tue, 08 Apr 2014 22:56:13 -0000 Message-Id: <509c8483002d4262b63358b30f9692d2@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] git commit: Recording .gitmergeinfo Changes Repository: cxf Updated Branches: refs/heads/2.6.x-fixes 4127f298e -> 06d2e9b33 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/06d2e9b3 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/06d2e9b3 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/06d2e9b3 Branch: refs/heads/2.6.x-fixes Commit: 06d2e9b333a0f89aa93787f4efb8d0d17435ec1b Parents: c377b50 Author: Daniel Kulp Authored: Tue Apr 8 16:55:34 2014 -0600 Committer: Daniel Kulp Committed: Tue Apr 8 16:55:34 2014 -0600 ---------------------------------------------------------------------- .gitmergeinfo | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/06d2e9b3/.gitmergeinfo ---------------------------------------------------------------------- diff --git a/.gitmergeinfo b/.gitmergeinfo index 015b27e..fad6798 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -104,6 +104,7 @@ B 180b7949081cee566c15a90653f2785ea8347937 B 180e3e92ed0d286195f74f7432cb107191cafa9b B 1817c17a36eb1118c8fbbaf3c120cc4da2b04295 B 185d7df330367537b7428c82369b6dd3e3ea59f6 +B 18b5c10c55c0b2d6c68251ec1fb2684b1de9667f B 18cd874616e7dd6f2c269b813e91832e5d4023c1 B 18e3ba84dcc2d75012d883803e4ce1237dde7833 B 18fb77d0040f363145e4e29c14bd3486471a997b @@ -355,6 +356,7 @@ B 553f64f07b083c779937231659cccb467c80710b B 5576a21718a07df18f02c918d38f40650aa731f3 B 558330f52fe8999bdad779da3eb29c2131c59133 B 55bbc673bd2db12e245a06b677f85fed038399c4 +B 55ca636f27fe8d736ba0dd3d00308bcd31fbc1f6 B 55f39ce0f5ccf7b92a0db64bae10f0230b542452 B 5607028e6dbe7804cec38ae676227740d07467db B 560f00dee8c5c712176ffc25dbe8a9669576582b @@ -774,6 +776,7 @@ B bbd5873156643ecfb1adda51d88b6f3d620f9d2d B bc8f7509df3b556f39804adf1c19b5d40eadb050 B bc9de3057ff4c720719e81e259cc9e716abde885 B bd5658444f7eead34f068e65daf289158ca74c82 +B bd56e16846770bd7369f94be856d7f756cb380f5 B bda818b86024e3aa50c2b9df712b41995b13fab1 B be5043c8f0f7bb5566fae4b4737addf602ef82d9 B becdab108db28387b61bda75f03ce2f4ec697815