You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by kl...@apache.org on 2016/06/09 16:43:45 UTC
[1/2] incubator-geode git commit: GEODE-745: add include-locator
parameter in the command
Repository: incubator-geode
Updated Branches:
refs/heads/feature/GEODE-837 cfe3b6516 -> 39d9f9576
GEODE-745: add include-locator parameter in the command
This closes #153
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/7fb8a39b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/7fb8a39b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/7fb8a39b
Branch: refs/heads/feature/GEODE-837
Commit: 7fb8a39b99a6418dfb022dd344ef374baf7c146e
Parents: e4994c7
Author: gmeilen <gr...@gmail.com>
Authored: Wed Jun 8 11:14:30 2016 -0700
Committer: Jinmei Liao <ji...@pivotal.io>
Committed: Wed Jun 8 14:56:26 2016 -0700
----------------------------------------------------------------------
.../web/controllers/MiscellaneousCommandsController.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7fb8a39b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/MiscellaneousCommandsController.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/MiscellaneousCommandsController.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/MiscellaneousCommandsController.java
index a6c9708..3b1b754 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/MiscellaneousCommandsController.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/MiscellaneousCommandsController.java
@@ -208,9 +208,11 @@ public class MiscellaneousCommandsController extends AbstractCommandsController
@RequestMapping(method = RequestMethod.POST, value = "/shutdown")
@ResponseBody
- public String shutdown(@RequestParam(value = CliStrings.SHUTDOWN__TIMEOUT, defaultValue = "-1") final Integer timeout) {
+ public String shutdown(@RequestParam(value = CliStrings.SHUTDOWN__TIMEOUT, defaultValue = "-1") final Integer timeout,
+ @RequestParam(value = CliStrings.INCLUDE_LOCATORS, defaultValue = "false") final boolean includeLocators) {
CommandStringBuilder command = new CommandStringBuilder(CliStrings.SHUTDOWN);
command.addOption(CliStrings.SHUTDOWN__TIMEOUT, String.valueOf(timeout));
+ command.addOption(CliStrings.INCLUDE_LOCATORS, String.valueOf(includeLocators));
return processCommand(command.toString());
}
[2/2] incubator-geode git commit: Merge remote-tracking branch
'origin/develop' into feature/GEODE-837
Posted by kl...@apache.org.
Merge remote-tracking branch 'origin/develop' into feature/GEODE-837
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/39d9f957
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/39d9f957
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/39d9f957
Branch: refs/heads/feature/GEODE-837
Commit: 39d9f9576415c1ed82ac2ab47c809a617760db1d
Parents: cfe3b65 7fb8a39
Author: Kirk Lund <kl...@apache.org>
Authored: Thu Jun 9 09:39:06 2016 -0700
Committer: Kirk Lund <kl...@apache.org>
Committed: Thu Jun 9 09:39:06 2016 -0700
----------------------------------------------------------------------
.../web/controllers/MiscellaneousCommandsController.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------