geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kl...@apache.org
Subject [43/47] incubator-geode git commit: Merge remote-tracking branch 'origin/develop' into feature/GEODE-714
Date Fri, 08 Jan 2016 18:42:44 GMT
Merge remote-tracking branch 'origin/develop' into feature/GEODE-714


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

Branch: refs/heads/feature/GEODE-714
Commit: 14870f22cdab5c30ed1088a24b1da3563a617ae9
Parents: 4f07765 689de76
Author: Kirk Lund <klund@pivotal.io>
Authored: Fri Jan 8 09:34:52 2016 -0800
Committer: Kirk Lund <klund@pivotal.io>
Committed: Fri Jan 8 09:34:52 2016 -0800

----------------------------------------------------------------------
 DISCLAIMER                                      |   6 +
 LICENSE                                         | 279 +++++++++++++++
 LICENSE.txt                                     | 202 -----------
 NOTICE                                          | 334 ------------------
 README.md                                       |   6 +-
 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 +
 .../query/internal/index/CompactRangeIndex.java |   8 +-
 .../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 +
 .../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 ----
 .../functional/IndexOnEntrySetJUnitTest.java    | 335 ++++++++++++++++++
 .../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 +++++++++-
 .../gms/fd/GMSHealthMonitorJUnitTest.java       |  42 ++-
 .../OnGroupsFunctionExecutionDUnitTest.java     |   7 +-
 .../cache/tier/sockets/Bug37210DUnitTest.java   |   2 +
 .../cache/tier/sockets/CacheServerTestUtil.java |   2 +
 .../sockets/HAStartupAndFailoverDUnitTest.java  |  11 +-
 .../InstantiatorPropagationDUnitTest.java       |  37 +-
 .../sockets/UpdatePropagationDUnitTest.java     |   2 +
 .../CompressionCacheConfigDUnitTest.java        |  15 +-
 .../logging/log4j/Log4J2PerformanceTest.java    |   9 -
 .../log4j/LogWriterLoggerPerformanceTest.java   |   9 -
 .../offheap/SimpleMemoryAllocatorJUnitTest.java |   4 +-
 .../internal/process/PidFileJUnitTest.java      |   2 +-
 .../cli/shell/GfshHistoryJUnitTest.java         |  89 +++++
 .../java/dunit/standalone/DUnitLauncher.java    |   2 +-
 gradle/dependency-versions.properties           |   2 +-
 50 files changed, 1948 insertions(+), 1350 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/14870f22/gemfire-core/src/test/java/com/gemstone/gemfire/internal/logging/log4j/Log4J2PerformanceTest.java
----------------------------------------------------------------------
diff --cc gemfire-core/src/test/java/com/gemstone/gemfire/internal/logging/log4j/Log4J2PerformanceTest.java
index ddf106d,6d75f80..1ad30bd
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/logging/log4j/Log4J2PerformanceTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/logging/log4j/Log4J2PerformanceTest.java
@@@ -28,18 -28,11 +28,16 @@@ import org.apache.logging.log4j.Level
  import org.apache.logging.log4j.LogManager;
  import org.apache.logging.log4j.Logger;
  import org.apache.logging.log4j.core.config.ConfigurationFactory;
- import org.apache.logging.log4j.util.PropertiesUtil;
 +import org.junit.Ignore;
 +import org.junit.experimental.categories.Category;
  
  import com.gemstone.gemfire.internal.FileUtil;
  import com.gemstone.gemfire.internal.logging.LoggingPerformanceTestCase;
  import com.gemstone.gemfire.internal.util.IOUtils;
 +import com.gemstone.gemfire.test.junit.categories.PerformanceTest;
- import com.gemstone.org.apache.logging.log4j.core.config.xml.GemFireXmlConfigurationFactory;
  
 +@Category(PerformanceTest.class)
 +@Ignore("Tests have no assertions")
  public class Log4J2PerformanceTest extends LoggingPerformanceTestCase {
  
    protected static final int DEFAULT_LOG_FILE_SIZE_LIMIT = Integer.MAX_VALUE;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/14870f22/gemfire-core/src/test/java/com/gemstone/gemfire/internal/logging/log4j/LogWriterLoggerPerformanceTest.java
----------------------------------------------------------------------
diff --cc gemfire-core/src/test/java/com/gemstone/gemfire/internal/logging/log4j/LogWriterLoggerPerformanceTest.java
index 926bc75,506e487..3d8ee46
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/logging/log4j/LogWriterLoggerPerformanceTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/logging/log4j/LogWriterLoggerPerformanceTest.java
@@@ -27,18 -27,11 +27,16 @@@ import org.apache.commons.io.FileUtils
  import org.apache.logging.log4j.Level;
  import org.apache.logging.log4j.Logger;
  import org.apache.logging.log4j.core.config.ConfigurationFactory;
- import org.apache.logging.log4j.util.PropertiesUtil;
 +import org.junit.Ignore;
 +import org.junit.experimental.categories.Category;
  
  import com.gemstone.gemfire.internal.FileUtil;
  import com.gemstone.gemfire.internal.logging.LoggingPerformanceTestCase;
  import com.gemstone.gemfire.internal.util.IOUtils;
 +import com.gemstone.gemfire.test.junit.categories.PerformanceTest;
- import com.gemstone.org.apache.logging.log4j.core.config.xml.GemFireXmlConfigurationFactory;
  
 +@Category(PerformanceTest.class)
 +@Ignore("Tests have no assertions")
  public class LogWriterLoggerPerformanceTest extends LoggingPerformanceTestCase {
  
    protected static final int DEFAULT_LOG_FILE_SIZE_LIMIT = Integer.MAX_VALUE;


Mime
View raw message