Merge remote-tracking branch 'origin/develop' into feature/GEODE-835
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/ce2ac683 Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/ce2ac683 Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/ce2ac683 Branch: refs/heads/feature/GEODE-835 Commit: ce2ac68308448309f5501ce9683b91d2b1e74630 Parents: 52f21b0 853c40d Author: Kirk Lund <kl...@pivotal.io> Authored: Fri May 20 17:04:30 2016 -0700 Committer: Kirk Lund <kl...@pivotal.io> Committed: Fri May 20 17:04:30 2016 -0700 ---------------------------------------------------------------------- .../internal/PooledExecutorWithDMStats.java | 9 +- .../internal/locks/DLockService.java | 9 +- .../internal/cache/GemFireCacheImpl.java | 37 +- .../gemfire/internal/cache/LocalRegion.java | 2 +- .../gemfire/internal/jndi/JNDIInvoker.java | 3 +- .../management/internal/cli/CommandManager.java | 4 +- .../cli/exceptions/CliCommandException.java | 37 +- .../exceptions/CliCommandInvalidException.java | 16 +- .../CliCommandMultiModeOptionException.java | 16 +- .../CliCommandNotAvailableException.java | 12 +- .../exceptions/CliCommandOptionException.java | 36 +- ...CommandOptionHasMultipleValuesException.java | 17 +- .../CliCommandOptionInvalidException.java | 14 +- .../CliCommandOptionMissingException.java | 17 +- .../CliCommandOptionNotApplicableException.java | 20 +- ...liCommandOptionValueConversionException.java | 16 +- .../CliCommandOptionValueException.java | 25 +- .../CliCommandOptionValueMissingException.java | 20 +- .../internal/cli/exceptions/CliException.java | 17 +- .../cli/exceptions/ExceptionGenerator.java | 28 +- .../management/internal/cli/parser/Option.java | 2 +- .../cli/parser/jopt/JoptOptionParser.java | 27 +- .../gemfire/cache30/MultiVMRegionTestCase.java | 1 - .../internal/cache/GemFireCacheImplTest.java | 66 +++ .../internal/cli/JoptOptionParserTest.java | 507 +++++++++++++++++++ .../com/gemstone/gemfire/test/fake/Fakes.java | 10 + ...IndexCreationPersistenceIntegrationTest.java | 2 + 27 files changed, 803 insertions(+), 167 deletions(-) ----------------------------------------------------------------------
