You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by km...@apache.org on 2016/10/20 23:38:05 UTC
[3/3] incubator-geode git commit: Merge remote-tracking branch
'origin/develop' into feature/GEODE-2019
Merge remote-tracking branch 'origin/develop' into feature/GEODE-2019
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/bc060f95
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/bc060f95
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/bc060f95
Branch: refs/heads/develop
Commit: bc060f95c1f889fe5c6261006fe8a2591bfe6187
Parents: 139c0a3 7e659b2
Author: Karen Miller <km...@pivotal.io>
Authored: Thu Oct 20 16:37:25 2016 -0700
Committer: Karen Miller <km...@pivotal.io>
Committed: Thu Oct 20 16:37:25 2016 -0700
----------------------------------------------------------------------
.../LauncherLifecycleCommandsDUnitTest.java | 22 ++++++
.../geode/distributed/ServerLauncher.java | 78 ++++++++++++++------
.../membership/gms/membership/GMSJoinLeave.java | 7 +-
.../cli/commands/LauncherLifecycleCommands.java | 29 +++++++-
.../internal/cli/commands/ShellCommands.java | 48 +++---------
.../internal/cli/i18n/CliStrings.java | 13 +++-
.../management/internal/cli/shell/Gfsh.java | 41 ++++++----
.../geode.apache.org/schema/cache/cache-1.0.xsd | 4 +
.../PRColocatedEquiJoinDUnitTest.java | 2 +
.../cli/commands/golden-help-offline.properties | 9 +++
10 files changed, 172 insertions(+), 81 deletions(-)
----------------------------------------------------------------------