Merge branch 'develop' into feature/GEODE-1801
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/eafd8cc9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/eafd8cc9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/eafd8cc9 Branch: refs/heads/feature/e2e-testing Commit: eafd8cc9c85f70203ab812e308423791cdbfd581 Parents: 4345fda 0ad1848 Author: Udo Kohlmeyer <[email protected]> Authored: Wed Sep 28 09:35:34 2016 +1000 Committer: Udo Kohlmeyer <[email protected]> Committed: Wed Sep 28 09:35:34 2016 +1000 ---------------------------------------------------------------------- build.gradle | 11 ++ etc/eclipseFormatterProfile.xml | 2 +- etc/intellijIdeaCodeStyle.xml | 2 + geode-assembly/build.gradle | 2 + .../geode/internal/cache/AbstractRegionMap.java | 59 +++++----- .../geode/internal/net/JSSESocketJUnitTest.java | 111 ++++++------------- .../net/SocketCreatorFactoryJUnitTest.java | 77 +++++++------ .../security/AbstractSecureServerDUnitTest.java | 7 +- ...ientRegisterInterestAuthDistributedTest.java | 1 - geode-examples/build.gradle | 6 + geode-examples/replicated/scripts/pidkiller.sh | 5 +- geode-examples/replicated/scripts/setEnv.sh | 2 +- geode-examples/replicated/scripts/startAll.sh | 2 +- geode-examples/replicated/scripts/stopAll.sh | 2 +- 14 files changed, 138 insertions(+), 151 deletions(-) ----------------------------------------------------------------------
