geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kl...@apache.org
Subject [19/19] incubator-geode git commit: Merge remote-tracking branch 'origin/develop' into feature/GEODE-715
Date Thu, 21 Jan 2016 19:09:05 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/d3263ec2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/d3263ec2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/d3263ec2

Branch: refs/heads/feature/GEODE-715
Commit: d3263ec24ec522681c2d434c3889d6c95939f105
Parents: f936d7d 1be4f93
Author: Kirk Lund <klund@pivotal.io>
Authored: Thu Jan 21 11:00:27 2016 -0800
Committer: Kirk Lund <klund@pivotal.io>
Committed: Thu Jan 21 11:00:27 2016 -0800

----------------------------------------------------------------------
 build.gradle                                    |   1 +
 gemfire-assembly/build.gradle                   |   1 +
 .../management/internal/AgentUtilJUnitTest.java |  24 +-
 .../com/gemstone/gemfire/admin/AdminConfig.java |   2 +-
 .../gemfire/admin/AdminDistributedSystem.java   |   2 +-
 .../admin/AdminDistributedSystemFactory.java    |   2 +-
 .../gemstone/gemfire/admin/AdminException.java  |   2 +-
 .../gemfire/admin/AdminXmlException.java        |   2 +-
 .../java/com/gemstone/gemfire/admin/Alert.java  |   2 +-
 .../com/gemstone/gemfire/admin/AlertLevel.java  |   2 +-
 .../gemstone/gemfire/admin/AlertListener.java   |   2 +-
 .../gemstone/gemfire/admin/BackupStatus.java    |   2 +-
 .../admin/CacheDoesNotExistException.java       |   2 +-
 .../gemfire/admin/CacheHealthConfig.java        |   2 +-
 .../com/gemstone/gemfire/admin/CacheVm.java     |   2 +-
 .../gemstone/gemfire/admin/CacheVmConfig.java   |   2 +-
 .../gemfire/admin/ConfigurationParameter.java   |   2 +-
 .../gemfire/admin/DistributedSystemConfig.java  |   2 +-
 .../admin/DistributedSystemHealthConfig.java    |   2 +-
 .../gemfire/admin/DistributionLocator.java      |   2 +-
 .../admin/DistributionLocatorConfig.java        |   2 +-
 .../gemstone/gemfire/admin/GemFireHealth.java   |   2 +-
 .../gemfire/admin/GemFireHealthConfig.java      |   2 +-
 .../gemfire/admin/GemFireMemberStatus.java      |   2 +-
 .../gemstone/gemfire/admin/ManagedEntity.java   |   2 +-
 .../gemfire/admin/ManagedEntityConfig.java      |   2 +-
 .../gemfire/admin/MemberHealthConfig.java       |   2 +-
 .../admin/OperationCancelledException.java      |   2 +-
 .../gemfire/admin/RegionNotFoundException.java  |   2 +-
 .../gemfire/admin/RegionSubRegionSnapshot.java  |   2 +-
 .../gemfire/admin/RuntimeAdminException.java    |   2 +-
 .../com/gemstone/gemfire/admin/Statistic.java   |   2 +-
 .../gemfire/admin/StatisticResource.java        |   2 +-
 .../gemstone/gemfire/admin/SystemMember.java    |   2 +-
 .../gemfire/admin/SystemMemberCache.java        |   2 +-
 .../gemfire/admin/SystemMemberCacheEvent.java   |   2 +-
 .../admin/SystemMemberCacheListener.java        |   2 +-
 .../gemfire/admin/SystemMemberCacheServer.java  |   2 +-
 .../gemfire/admin/SystemMemberRegion.java       |   2 +-
 .../gemfire/admin/SystemMemberRegionEvent.java  |   2 +-
 .../gemfire/admin/SystemMemberType.java         |   2 +-
 .../gemfire/admin/SystemMembershipEvent.java    |   2 +-
 .../gemfire/admin/SystemMembershipListener.java |   2 +-
 .../UnmodifiableConfigurationException.java     |   2 +-
 .../com/gemstone/gemfire/admin/jmx/Agent.java   |   2 +-
 .../gemstone/gemfire/admin/jmx/AgentConfig.java |   2 +-
 .../gemfire/admin/jmx/AgentFactory.java         |   2 +-
 .../jmx/internal/RMIRegistryServiceMBean.java   |   2 +-
 .../gemfire/cache/AttributesMutator.java        |  11 +-
 .../internal/ParallelAsyncEventQueueImpl.java   |   8 +-
 .../internal/SerialAsyncEventQueueImpl.java     |   8 +-
 .../cache/query/internal/CompiledIn.java        | 106 +----
 .../query/internal/CompiledInJUnitTest.java     | 405 +++++++++++++++++++
 .../internal/LocalStatisticsFactory.java        |   4 +-
 .../internal/admin/StatAlertsManager.java       |  10 +-
 .../gemfire/internal/cache/DiskStoreImpl.java   |   4 +-
 .../cache/PartitionedRegionDataStore.java       |  27 +-
 .../partitioned/PartitionedRegionObserver.java  |   5 +
 .../PartitionedRegionObserverAdapter.java       |   4 +
 .../cache/versions/RegionVersionHolder.java     |   4 +-
 .../cache/wan/AbstractGatewaySender.java        |  31 +-
 .../AbstractGatewaySenderEventProcessor.java    |   8 +-
 .../cache/wan/GatewaySenderAdvisor.java         |   4 +-
 .../ParallelGatewaySenderEventProcessor.java    |   8 +-
 .../parallel/ParallelGatewaySenderQueue.java    |  61 ++-
 .../ParallelGatewaySenderQueueJUnitTest.java    |  87 ++++
 ...urrentSerialGatewaySenderEventProcessor.java |   9 +
 .../gemfire/internal/logging/MergeLogFiles.java |   6 -
 .../internal/offheap/OffHeapStorage.java        |  48 +--
 .../internal/offheap/SyncChunkStack.java        |  13 +-
 .../gemfire/management/internal/AgentUtil.java  | 110 ++---
 .../management/internal/ManagementAgent.java    |  17 +-
 .../gemfire/management/internal/RestAgent.java  |   2 +-
 .../beans/GatewaySenderMBeanBridge.java         |   8 +-
 .../internal/beans/stats/StatsKey.java          |   1 -
 .../cli/commands/LauncherLifecycleCommands.java |   2 -
 .../com/gemstone/gemfire/UnitTestDoclet.java    |   7 +-
 .../SortedListForAsyncQueueJUnitTest.java       |   4 +-
 .../MemLRUEvictionControllerDUnitTest.java      |   4 -
 .../internal/cache/Bug39079DUnitTest.java       |   4 +-
 .../internal/cache/DiskRegionJUnitTest.java     | 172 +++-----
 .../internal/cache/DiskRegionTestingBase.java   |   1 -
 .../PartitionedRegionDataStoreJUnitTest.java    |  73 ++++
 .../sockets/RedundancyLevelPart1DUnitTest.java  |   4 +
 .../versions/RegionVersionHolder2JUnitTest.java |  20 +
 ...ialGatewaySenderEventProcessorJUnitTest.java |  42 ++
 .../offheap/LifecycleListenerJUnitTest.java     |   9 +-
 .../offheap/OffHeapStorageJUnitTest.java        | 241 +++++------
 .../offheap/SimpleMemoryAllocatorJUnitTest.java |   7 +-
 .../offheap/SyncChunkStackJUnitTest.java        | 289 +++++++++++++
 .../bean/stats/GatewayMBeanBridgeJUnitTest.java | 108 +++++
 .../bean/stats/GatewaySenderStatsJUnitTest.java | 101 -----
 .../gemfire/test/junit/ConditionalIgnore.java   |  49 +++
 .../gemfire/test/junit/IgnoreCondition.java     |  32 ++
 .../gemfire/test/junit/IgnoreUntil.java         |  49 +++
 .../com/gemstone/gemfire/test/junit/Repeat.java |  43 ++
 .../com/gemstone/gemfire/test/junit/Retry.java  |  38 ++
 .../test/junit/rules/ConditionalIgnoreRule.java | 123 ++++++
 .../test/junit/rules/ExpectedTimeoutRule.java   | 180 +++++++++
 .../test/junit/rules/IgnoreUntilRule.java       | 123 ++++++
 .../gemfire/test/junit/rules/RepeatRule.java    |  81 ++++
 .../gemfire/test/junit/rules/RetryRule.java     | 181 +++++++++
 .../rules/SerializableExternalResource.java     | 107 +++++
 .../test/junit/rules/SerializableRuleChain.java | 119 ++++++
 .../rules/SerializableTemporaryFolder.java      |  70 ++++
 .../test/junit/rules/SerializableTestName.java  |  54 +++
 .../test/junit/rules/SerializableTestRule.java  |  33 ++
 .../junit/rules/SerializableTestWatcher.java    |  29 ++
 .../test/junit/rules/SerializableTimeout.java   | 119 ++++++
 .../examples/RepeatingTestCasesExampleTest.java |  94 +++++
 .../rules/examples/RetryRuleExampleTest.java    |  43 ++
 .../rules/tests/ExpectedTimeoutRuleTest.java    | 214 ++++++++++
 .../junit/rules/tests/IgnoreUntilRuleTest.java  | 121 ++++++
 .../junit/rules/tests/JUnitRuleTestSuite.java   |  33 ++
 .../test/junit/rules/tests/RepeatRuleTest.java  | 304 ++++++++++++++
 .../tests/RetryRuleGlobalWithErrorTest.java     | 250 ++++++++++++
 .../tests/RetryRuleGlobalWithExceptionTest.java | 254 ++++++++++++
 .../tests/RetryRuleLocalWithErrorTest.java      | 207 ++++++++++
 .../tests/RetryRuleLocalWithExceptionTest.java  | 213 ++++++++++
 .../junit/rules/tests/RuleAndClassRuleTest.java | 138 +++++++
 .../test/junit/rules/tests/TestRunner.java      |  37 ++
 .../junit/support/DefaultIgnoreCondition.java   |  57 +++
 .../IgnoreConditionEvaluationException.java     |  43 ++
 123 files changed, 4958 insertions(+), 693 deletions(-)
----------------------------------------------------------------------



Mime
View raw message