Return-Path: X-Original-To: apmail-brooklyn-commits-archive@minotaur.apache.org Delivered-To: apmail-brooklyn-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 074B710998 for ; Fri, 13 Jun 2014 06:35:33 +0000 (UTC) Received: (qmail 77662 invoked by uid 500); 13 Jun 2014 06:35:32 -0000 Delivered-To: apmail-brooklyn-commits-archive@brooklyn.apache.org Received: (qmail 77640 invoked by uid 500); 13 Jun 2014 06:35:32 -0000 Mailing-List: contact commits-help@brooklyn.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@brooklyn.incubator.apache.org Delivered-To: mailing list commits@brooklyn.incubator.apache.org Received: (qmail 77633 invoked by uid 99); 13 Jun 2014 06:35:32 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 13 Jun 2014 06:35:32 +0000 X-ASF-Spam-Status: No, hits=-2000.7 required=5.0 tests=ALL_TRUSTED,RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Fri, 13 Jun 2014 06:35:31 +0000 Received: (qmail 77597 invoked by uid 99); 13 Jun 2014 06:35:11 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 13 Jun 2014 06:35:11 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 3D120932772; Fri, 13 Jun 2014 06:35:11 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: richard@apache.org To: commits@brooklyn.incubator.apache.org Date: Fri, 13 Jun 2014 06:35:13 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [3/3] git commit: Merge pull request #1473 from Nakomis/couchbase-sensors X-Virus-Checked: Checked by ClamAV on apache.org Merge pull request #1473 from Nakomis/couchbase-sensors Couchbase sensors Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/b6512014 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/b6512014 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/b6512014 Branch: refs/heads/master Commit: b6512014ae62683877b556c98bec66ef340e7f96 Parents: 7358c58 3dfdda5 Author: Alex Heneveld Authored: Fri Jun 13 07:33:02 2014 +0100 Committer: Alex Heneveld Committed: Fri Jun 13 07:33:02 2014 +0100 ---------------------------------------------------------------------- .../nosql/couchbase/CouchbaseCluster.java | 4 + .../nosql/couchbase/CouchbaseClusterImpl.java | 46 +++++++++++ .../entity/nosql/couchbase/CouchbaseNode.java | 26 +++++++ .../nosql/couchbase/CouchbaseNodeImpl.java | 82 ++++++++++++++++++++ 4 files changed, 158 insertions(+) ----------------------------------------------------------------------