Merge branch 'feature/GEODE-420' into feature/GEODE-1792
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/d79a944b Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/d79a944b Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/d79a944b Branch: refs/heads/feature/GEODE-420 Commit: d79a944b6ada74eeb8214a0c60a728e57152b7f8 Parents: 156d2d1 6853f56 Author: Udo Kohlmeyer <[email protected]> Authored: Wed Sep 7 03:30:14 2016 +1000 Committer: Udo Kohlmeyer <[email protected]> Committed: Wed Sep 7 03:30:14 2016 +1000 ---------------------------------------------------------------------- .../internal/DistributionConfigImpl.java | 15 +- .../gemfire/internal/AbstractConfig.java | 5 + .../internal/security/SecurableComponent.java | 6 +- .../internal/JmxManagerLocatorRequest.java | 6 +- .../internal/cli/commands/ShellCommands.java | 13 +- .../ConnectToLocatorSSLDUnitTest.java | 151 +++++++++++++++++++ 6 files changed, 178 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d79a944b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfigImpl.java ----------------------------------------------------------------------
