Return-Path: X-Original-To: apmail-geode-commits-archive@minotaur.apache.org Delivered-To: apmail-geode-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 0ED1C189F7 for ; Thu, 5 Nov 2015 20:35:55 +0000 (UTC) Received: (qmail 92382 invoked by uid 500); 5 Nov 2015 20:35:54 -0000 Delivered-To: apmail-geode-commits-archive@geode.apache.org Received: (qmail 92356 invoked by uid 500); 5 Nov 2015 20:35:54 -0000 Mailing-List: contact commits-help@geode.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@geode.incubator.apache.org Delivered-To: mailing list commits@geode.incubator.apache.org Received: (qmail 92270 invoked by uid 99); 5 Nov 2015 20:35:54 -0000 Received: from Unknown (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 05 Nov 2015 20:35:54 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id 7968F1A096D for ; Thu, 5 Nov 2015 20:35:54 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.771 X-Spam-Level: * X-Spam-Status: No, score=1.771 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-eu-west.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id mQFeDi95YnxN for ; Thu, 5 Nov 2015 20:35:45 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-eu-west.apache.org (ASF Mail Server at mx1-eu-west.apache.org) with SMTP id 7931125CD5 for ; Thu, 5 Nov 2015 20:35:41 +0000 (UTC) Received: (qmail 90285 invoked by uid 99); 5 Nov 2015 20:35:39 -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; Thu, 05 Nov 2015 20:35:39 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 330B8E5467; Thu, 5 Nov 2015 20:35:39 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bschuchardt@apache.org To: commits@geode.incubator.apache.org Date: Thu, 05 Nov 2015 20:36:11 -0000 Message-Id: In-Reply-To: <20c4b29bd8ec4fe69e28b9bc027a7f1a@git.apache.org> References: <20c4b29bd8ec4fe69e28b9bc027a7f1a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [34/50] [abbrv] incubator-geode git commit: Merge remote-tracking branch 'origin/develop' into feature/GEODE-409 Merge remote-tracking branch 'origin/develop' into feature/GEODE-409 Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/33cb42bd Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/33cb42bd Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/33cb42bd Branch: refs/heads/feature/GEODE-77 Commit: 33cb42bd5653fd221804e3082db8b228bcc962cb Parents: f2a2669 e9aa18b Author: Darrel Schneider Authored: Mon Nov 2 14:59:50 2015 -0800 Committer: Darrel Schneider Committed: Mon Nov 2 14:59:50 2015 -0800 ---------------------------------------------------------------------- build.gradle | 15 +- .../gemstone/gemfire/cache/EntryOperation.java | 2 +- .../internal/cache/EntryOperationImpl.java | 2 +- .../internal/beans/MemberMBeanBridge.java | 1 + .../internal/cli/commands/ShellCommands.java | 7 +- .../controllers/AbstractCommandsController.java | 7 +- .../controllers/ShellCommandsController.java | 178 ++++++++++--------- .../java/dunit/standalone/ProcessManager.java | 2 - gemfire-web/build.gradle | 4 +- .../ShellCommandsControllerJUnitTest.java | 47 +++-- 10 files changed, 152 insertions(+), 113 deletions(-) ----------------------------------------------------------------------