Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id E77BB200CA4 for ; Wed, 7 Jun 2017 13:00:51 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id E63D4160BE2; Wed, 7 Jun 2017 11:00:51 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 6608E160BB6 for ; Wed, 7 Jun 2017 13:00:51 +0200 (CEST) Received: (qmail 16774 invoked by uid 500); 7 Jun 2017 11:00:50 -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 16765 invoked by uid 99); 7 Jun 2017 11:00:50 -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; Wed, 07 Jun 2017 11:00:50 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 7F57FDFB8A; Wed, 7 Jun 2017 11:00:50 +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: Wed, 07 Jun 2017 11:00:50 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/2] cxf git commit: Updating Apache DS archived-at: Wed, 07 Jun 2017 11:00:52 -0000 Repository: cxf Updated Branches: refs/heads/3.1.x-fixes 4b88582c4 -> 355ad864f Updating Apache DS # Conflicts: # parent/pom.xml Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/6f3e4aa1 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/6f3e4aa1 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/6f3e4aa1 Branch: refs/heads/3.1.x-fixes Commit: 6f3e4aa162c2ec1c78256b57d98f735cfb15a2fb Parents: 4b88582 Author: Colm O hEigeartaigh Authored: Wed Jun 7 11:59:53 2017 +0100 Committer: Colm O hEigeartaigh Committed: Wed Jun 7 12:00:38 2017 +0100 ---------------------------------------------------------------------- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/6f3e4aa1/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index be1f265..ab1c7db 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -69,7 +69,7 @@ 1.1.3_2 5.14.4 1.9.8 - 2.0.0-M23 + 2.0.0-M24 2.3.7 [2.0,2.4) 1.2.14