Merge branch 'develop' into feature/GEODE-420
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/9df6715e Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/9df6715e Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/9df6715e Branch: refs/heads/feature/GEODE-420 Commit: 9df6715ef8c1225ffe091475a132363a0e2f6b2e Parents: 8ff5e7a 71c863b Author: Udo Kohlmeyer <[email protected]> Authored: Tue Sep 13 05:30:23 2016 +1000 Committer: Udo Kohlmeyer <[email protected]> Committed: Tue Sep 13 05:30:23 2016 +1000 ---------------------------------------------------------------------- geode-assembly/src/main/dist/bin/gfsh | 7 -- .../gemfire/distributed/DistributedSystem.java | 2 +- .../gemfire/internal/GemFireVersion.java | 2 +- .../internal/GemFireVersionJUnitTest.java | 10 +++ .../internal/cache/DiskRegionJUnitTest.java | 4 +- ...tentColocatedPartitionedRegionDUnitTest.java | 44 +++++++++--- .../asyncqueue/AsyncEventListenerDUnitTest.java | 74 +++++++------------- .../test/dunit/standalone/ProcessManager.java | 1 + .../project/Dependencies.scala | 2 +- gradle/ide.gradle | 11 +-- 10 files changed, 84 insertions(+), 73 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9df6715e/geode-core/src/main/java/com/gemstone/gemfire/internal/GemFireVersion.java ----------------------------------------------------------------------
