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 C6B9118E3B for ; Mon, 1 Feb 2016 17:30:42 +0000 (UTC) Received: (qmail 72607 invoked by uid 500); 1 Feb 2016 17:30:42 -0000 Delivered-To: apmail-brooklyn-commits-archive@brooklyn.apache.org Received: (qmail 72533 invoked by uid 500); 1 Feb 2016 17:30: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 72488 invoked by uid 99); 1 Feb 2016 17:30: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; Mon, 01 Feb 2016 17:30:42 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 39F07E0994; Mon, 1 Feb 2016 17:30:42 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: heneveld@apache.org To: commits@brooklyn.apache.org Date: Mon, 01 Feb 2016 17:30:58 -0000 Message-Id: In-Reply-To: <97f68a643b3b4bce95f1a550c374189b@git.apache.org> References: <97f68a643b3b4bce95f1a550c374189b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [18/27] brooklyn git commit: Merge branch 'refs/heads/ENGR-1668-GemfireEntities-Strike2' into ENGR-2103-Gemfire-Effectors Merge branch 'refs/heads/ENGR-1668-GemfireEntities-Strike2' into ENGR-2103-Gemfire-Effectors Conflicts: .gitignore extra/src/main/java/brooklyn/entity/nosql/gemfire/GemfireServer.groovy extra/src/main/java/brooklyn/entity/nosql/gemfire/GemfireSetup.groovy extra/src/test/java/brooklyn/entity/nosql/gemfire/GemfireServerIntegrationTest.groovy extra/src/test/resources/brooklyn/entity/nosql/gemfire/eu/cache.xml gemfire/pom.xml gemfire/src/brooklyn/gemfire/demo/GatewayRequestHandler.java gemfire/src/main/java/brooklyn/gemfire/demo/GatewayRequestHandler.java gemfire/src/main/java/brooklyn/gemfire/demo/GeneralRequestHandler.java gemfire/src/main/java/brooklyn/gemfire/demo/HubManager.java gemfire/start.sh Project: http://git-wip-us.apache.org/repos/asf/brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn/commit/f5de9d88 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn/tree/f5de9d88 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn/diff/f5de9d88 Branch: refs/heads/0.4.0 Commit: f5de9d8875be6c18987b844fab65ba0f4ab3e998 Parents: 19f4f27 fc59fd9 Author: danikov Authored: Fri Oct 28 14:24:22 2011 +0100 Committer: danikov Committed: Fri Oct 28 14:24:22 2011 +0100 ---------------------------------------------------------------------- ----------------------------------------------------------------------