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 <[email protected]> Authored: Mon Nov 2 14:59:50 2015 -0800 Committer: Darrel Schneider <[email protected]> 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(-) ----------------------------------------------------------------------
