geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kl...@apache.org
Subject [8/8] incubator-geode git commit: Merge remote-tracking branch 'origin/develop' into feature/GEODE-715
Date Mon, 04 Jan 2016 17:04:44 GMT
Merge remote-tracking branch 'origin/develop' into feature/GEODE-715


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

Branch: refs/heads/feature/GEODE-715
Commit: b3851df511eb0fa37ffbe9d3f28114009f592ce6
Parents: 49754b3 ca6148a
Author: Kirk Lund <klund@pivotal.io>
Authored: Mon Jan 4 09:04:14 2016 -0800
Committer: Kirk Lund <klund@pivotal.io>
Committed: Mon Jan 4 09:04:14 2016 -0800

----------------------------------------------------------------------
 build.gradle                                    |   21 +-
 gemfire-assembly/build.gradle                   |   23 +
 .../gemfire/distributed/internal/DMStats.java   |   80 ++
 .../distributed/internal/DistributionStats.java |  237 ++++
 .../internal/LonerDistributionManager.java      |   64 ++
 .../membership/gms/fd/GMSHealthMonitor.java     |   93 +-
 .../gemfire/internal/cache/LocalRegion.java     |   45 +-
 .../internal/cache/PartitionedRegion.java       |   75 --
 .../test/java/com/gemstone/gemfire/BadTest.java |   42 -
 .../cache30/Bug40255JUnitDisabledTest.java      |  139 ---
 .../gemfire/cache30/Bug40255JUnitTest.java      |  143 +++
 .../cache30/Bug40662JUnitDisabledTest.java      |   92 --
 .../gemfire/cache30/Bug40662JUnitTest.java      |   93 ++
 .../gemfire/cache30/SearchAndLoadDUnitTest.java |  177 ++-
 .../locks/CollaborationJUnitDisabledTest.java   |  562 ----------
 .../internal/locks/CollaborationJUnitTest.java  |  617 +++++++++++
 .../gms/fd/GMSHealthMonitorJUnitTest.java       |   42 +-
 .../DiskRegionPerfJUnitPerformanceTest.java     |    6 +-
 ...HARegionQueueStartStopJUnitDisabledTest.java |  123 ---
 .../cache/tier/sockets/HAInterestBaseTest.java  | 1015 -----------------
 .../tier/sockets/HAInterestPart1DUnitTest.java  |  102 +-
 .../tier/sockets/HAInterestPart2DUnitTest.java  |  116 +-
 .../cache/tier/sockets/HAInterestTestCase.java  | 1018 ++++++++++++++++++
 .../tier/sockets/command/CommitCommandTest.java |    6 +
 .../logging/LogWriterPerformanceTest.java       |    6 +
 .../log4j/Log4J2DisabledPerformanceTest.java    |    6 +
 .../logging/log4j/Log4J2PerformanceTest.java    |    9 +-
 .../LogWriterLoggerDisabledPerformanceTest.java |    6 +
 .../log4j/LogWriterLoggerPerformanceTest.java   |    9 +-
 .../internal/process/PidFileJUnitTest.java      |    2 +-
 .../test/java/dunit/DistributedTestCase.java    |    3 +
 ...IndexRepositoryImplJUnitPerformanceTest.java |  437 --------
 .../IndexRepositoryImplPerformanceTest.java     |  439 ++++++++
 33 files changed, 3178 insertions(+), 2670 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b3851df5/gemfire-core/src/test/java/dunit/DistributedTestCase.java
----------------------------------------------------------------------
diff --cc gemfire-core/src/test/java/dunit/DistributedTestCase.java
index 7aa8e6f,6fa560f..6af972a
--- a/gemfire-core/src/test/java/dunit/DistributedTestCase.java
+++ b/gemfire-core/src/test/java/dunit/DistributedTestCase.java
@@@ -86,8 -87,10 +87,9 @@@ import com.gemstone.gemfire.internal.lo
  import com.gemstone.gemfire.internal.logging.ManagerLogWriter;
  import com.gemstone.gemfire.internal.logging.log4j.LogWriterLogger;
  import com.gemstone.gemfire.management.internal.cli.LogWrapper;
 +import com.gemstone.gemfire.test.dunit.standalone.DUnitLauncher;
+ import com.gemstone.gemfire.test.junit.categories.DistributedTest;
  
 -import dunit.standalone.DUnitLauncher;
 -
  /**
   * This class is the superclass of all distributed unit tests.
   * 


Mime
View raw message