Merge remote-tracking branch 'origin/develop' into feature/GEODE-217

Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/47ac6e53
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/47ac6e53
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/47ac6e53

Branch: refs/heads/feature/GEODE-217
Commit: 47ac6e536a093188a62868e896ef254359de0f90
Parents: f65ef9b 0c0850c
Author: Kirk Lund <kl...@pivotal.io>
Authored: Fri Jan 8 14:36:40 2016 -0800
Committer: Kirk Lund <kl...@pivotal.io>
Committed: Fri Jan 8 14:36:40 2016 -0800

----------------------------------------------------------------------
 DISCLAIMER                                      |    6 +
 LICENSE                                         |  279 ++++
 LICENSE.txt                                     |  202 ---
 NOTICE                                          |  334 ----
 README.md                                       |    6 +-
 build.gradle                                    |   22 +-
 gemfire-assembly/build.gradle                   |   23 +
 gemfire-assembly/src/main/dist/DISCLAIMER       |    6 +
 gemfire-assembly/src/main/dist/LICENSE          |  346 +++++
 gemfire-assembly/src/main/dist/NOTICE           |    5 +
 .../cache/query/internal/DefaultQuery.java      |    8 +-
 .../cache/query/internal/QueryMonitor.java      |   26 +-
 .../query/internal/index/CompactRangeIndex.java |   10 +-
 .../query/internal/index/MemoryIndexStore.java  |   33 +-
 .../gemfire/distributed/DistributedSystem.java  |    1 +
 .../gemfire/distributed/internal/DMStats.java   |   80 +
 .../distributed/internal/DistributionStats.java |  237 +++
 .../distributed/internal/InternalLocator.java   |    7 +-
 .../internal/LonerDistributionManager.java      |   64 +
 .../membership/gms/fd/GMSHealthMonitor.java     |   93 +-
 .../internal/cache/AbstractRegionMap.java       |    6 +-
 .../internal/cache/GemFireCacheImpl.java        |   12 +-
 .../gemfire/internal/cache/LocalRegion.java     |   45 +-
 .../internal/cache/PartitionedRegion.java       |   75 -
 .../internal/cache/TombstoneService.java        |   10 +
 .../internal/cache/ha/HARegionQueue.java        |   22 +-
 .../gemfire/internal/logging/LogService.java    |   48 -
 .../internal/logging/log4j/LogWriterLogger.java |    7 -
 .../internal/cli/shell/JmxOperationInvoker.java |   10 +-
 .../internal/cli/shell/jline/GfshHistory.java   |   11 +-
 .../config/GemFireFileConfigurationMonitor.java |  145 --
 .../config/xml/GemFireXmlConfiguration.java     |  344 -----
 .../xml/GemFireXmlConfigurationFactory.java     |   59 -
 .../test/java/com/gemstone/gemfire/BadTest.java |   42 -
 .../functional/IndexOnEntrySetJUnitTest.java    |  335 ++++
 .../query/functional/PdxGroupByTestImpl.java    |    2 +-
 .../PutAllWithIndexPerfDUnitDisabledTest.java   |  215 ---
 .../index/PutAllWithIndexPerfDUnitTest.java     |  218 +++
 .../cache30/Bug40255JUnitDisabledTest.java      |  139 --
 .../gemfire/cache30/Bug40255JUnitTest.java      |  143 ++
 .../cache30/Bug40662JUnitDisabledTest.java      |   92 --
 .../gemfire/cache30/Bug40662JUnitTest.java      |   90 ++
 .../gemfire/cache30/CacheXml30DUnitTest.java    |   24 +
 .../gemfire/cache30/CacheXml41DUnitTest.java    |    7 +
 .../gemfire/cache30/CacheXml60DUnitTest.java    |   14 +-
 .../gemfire/cache30/CacheXml81DUnitTest.java    |    4 +
 .../gemfire/cache30/SearchAndLoadDUnitTest.java |  177 ++-
 .../cache30/SlowRecDUnitDisabledTest.java       | 1446 -----------------
 .../gemfire/cache30/SlowRecDUnitTest.java       | 1453 ++++++++++++++++++
 .../locks/CollaborationJUnitDisabledTest.java   |  562 -------
 .../internal/locks/CollaborationJUnitTest.java  |  617 ++++++++
 .../gms/fd/GMSHealthMonitorJUnitTest.java       |   42 +-
 ...cpServerBackwardCompatDUnitDisabledTest.java |  250 ---
 .../TcpServerBackwardCompatDUnitTest.java       |  256 +++
 .../internal/cache/Bug42010StatsDUnitTest.java  |  531 -------
 .../cache/EvictionDUnitDisabledTest.java        |  240 ---
 .../internal/cache/EvictionDUnitTest.java       |  246 +++
 .../cache/OffHeapEvictionDUnitTest.java         |    2 +-
 .../internal/cache/SingleHopStatsDUnitTest.java |  543 +++++++
 .../DiskRegionPerfJUnitPerformanceTest.java     |    6 +-
 .../OnGroupsFunctionExecutionDUnitTest.java     |    7 +-
 ...HARegionQueueStartStopJUnitDisabledTest.java |  123 --
 .../cache/ha/StatsBugDUnitDisabledTest.java     |  368 -----
 .../internal/cache/ha/StatsBugDUnitTest.java    |  374 +++++
 .../cache/tier/sockets/Bug37210DUnitTest.java   |    2 +
 .../cache/tier/sockets/CacheServerTestUtil.java |    2 +
 .../cache/tier/sockets/HAInterestBaseTest.java  | 1015 ------------
 .../tier/sockets/HAInterestPart1DUnitTest.java  |  102 +-
 .../tier/sockets/HAInterestPart2DUnitTest.java  |  116 +-
 .../cache/tier/sockets/HAInterestTestCase.java  | 1018 ++++++++++++
 .../sockets/HAStartupAndFailoverDUnitTest.java  |   11 +-
 .../InstantiatorPropagationDUnitTest.java       |   37 +-
 .../sockets/UpdatePropagationDUnitTest.java     |    2 +
 .../tier/sockets/command/CommitCommandTest.java |    6 +
 .../CompressionCacheConfigDUnitTest.java        |   15 +-
 .../logging/LogWriterPerformanceTest.java       |    6 +
 .../log4j/Log4J2DisabledPerformanceTest.java    |    6 +
 .../logging/log4j/Log4J2PerformanceTest.java    |   16 +-
 .../LogWriterLoggerDisabledPerformanceTest.java |    6 +
 .../log4j/LogWriterLoggerPerformanceTest.java   |   16 +-
 .../offheap/LifecycleListenerJUnitTest.java     |   23 +-
 .../offheap/SimpleMemoryAllocatorJUnitTest.java |   11 +-
 .../internal/process/PidFileJUnitTest.java      |    2 +-
 .../cli/shell/GfshHistoryJUnitTest.java         |   89 ++
 .../test/java/dunit/DistributedTestCase.java    |    3 +
 .../java/dunit/standalone/DUnitLauncher.java    |    2 +-
 .../java/dunit/standalone/ProcessManager.java   |    1 +
 .../test/junit/categories/ContainerTest.java    |   25 +
 .../test/junit/categories/HydraTest.java        |   24 +
 ...IndexRepositoryImplJUnitPerformanceTest.java |  437 ------
 .../IndexRepositoryImplPerformanceTest.java     |  439 ++++++
 gradle/dependency-versions.properties           |    2 +-
 92 files changed, 7604 insertions(+), 6980 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/47ac6e53/build.gradle
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/47ac6e53/gemfire-core/src/test/java/com/gemstone/gemfire/internal/process/PidFileJUnitTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/47ac6e53/gemfire-core/src/test/java/dunit/DistributedTestCase.java
----------------------------------------------------------------------

Reply via email to