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 0A45D200D35 for ; Tue, 7 Nov 2017 11:40:44 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 08B6E160C00; Tue, 7 Nov 2017 10:40:44 +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 46D0A1609C8 for ; Tue, 7 Nov 2017 11:40:43 +0100 (CET) Received: (qmail 53140 invoked by uid 500); 7 Nov 2017 10:40:42 -0000 Mailing-List: contact commits-help@brooklyn.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@brooklyn.apache.org Delivered-To: mailing list commits@brooklyn.apache.org Received: (qmail 53131 invoked by uid 99); 7 Nov 2017 10:40:42 -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; Tue, 07 Nov 2017 10:40:42 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 5C35BDF9AE; Tue, 7 Nov 2017 10:40:40 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: tbouron@apache.org To: commits@brooklyn.apache.org Date: Tue, 07 Nov 2017 10:40:41 -0000 Message-Id: <3b610a3d94954126a5449e48b93de3a9@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/2] brooklyn-server git commit: This closes #882 archived-at: Tue, 07 Nov 2017 10:40:44 -0000 This closes #882 Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/f59f59f5 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/f59f59f5 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/f59f59f5 Branch: refs/heads/master Commit: f59f59f567ccf3fa2205a59d3aae5ac8492e37d2 Parents: 59270dd 870f892 Author: Thomas Bouron Authored: Tue Nov 7 10:40:14 2017 +0000 Committer: Thomas Bouron Committed: Tue Nov 7 10:40:14 2017 +0000 ---------------------------------------------------------------------- karaf/init/src/main/resources/catalog.bom | 1 + server-cli/pom.xml | 11 +- .../main/resources/brooklyn/default.catalog.bom | 375 ------------------- server-cli/src/main/resources/catalog.bom | 352 ++--------------- 4 files changed, 33 insertions(+), 706 deletions(-) ----------------------------------------------------------------------