You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ab...@apache.org on 2015/12/02 18:28:40 UTC
[8/9] incubator-geode git commit: Merge branch 'develop' into
feature/GEODE-608
Merge branch 'develop' into feature/GEODE-608
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/adcfb646
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/adcfb646
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/adcfb646
Branch: refs/heads/feature/GEODE-608
Commit: adcfb6465273916f62844533f11f3ab73e468b4d
Parents: 4f20aba bff59d1
Author: Anthony Baker <ab...@pivotal.io>
Authored: Wed Dec 2 08:38:25 2015 -0800
Committer: Anthony Baker <ab...@pivotal.io>
Committed: Wed Dec 2 08:38:25 2015 -0800
----------------------------------------------------------------------
build.gradle | 1 +
gemfire-assembly/build.gradle | 2 -
gemfire-core/build.gradle | 1 -
.../com/gemstone/gemfire/SystemFailure.java | 4 +-
.../gemfire/admin/jmx/internal/AgentImpl.java | 15 +-
.../internal/GemFireHealthConfigJmxImpl.java | 14 +-
.../cache/query/internal/CompiledOperation.java | 4 +-
.../internal/DistributionChannel.java | 2 +-
.../internal/DistributionManager.java | 29 +-
.../internal/HighPriorityAckedMessage.java | 4 +-
.../distributed/internal/StartupMessage.java | 19 -
.../distributed/internal/StartupOperation.java | 1 -
.../internal/direct/DirectChannel.java | 16 +-
.../internal/direct/DirectChannelListener.java | 22 ++
.../DistributedMembershipListener.java | 13 +-
.../internal/membership/MemberFactory.java | 8 -
.../internal/membership/MemberServices.java | 6 -
.../internal/membership/MembershipManager.java | 13 -
.../internal/membership/NetView.java | 46 ++-
.../internal/membership/gms/GMSMember.java | 22 --
.../membership/gms/GMSMemberFactory.java | 12 +-
.../internal/membership/gms/GMSUtil.java | 19 +
.../membership/gms/fd/GMSHealthMonitor.java | 15 +-
.../membership/gms/membership/GMSJoinLeave.java | 25 +-
.../gms/messenger/JGroupsMessenger.java | 17 +-
.../gms/mgr/GMSMembershipManager.java | 342 +++--------------
.../gemfire/internal/StatArchiveWriter.java | 28 +-
.../internal/cache/AbstractUpdateOperation.java | 4 +-
.../internal/cache/TXStateProxyImpl.java | 4 +-
.../cache/tier/sockets/AcceptorImpl.java | 4 +-
.../cache/tier/sockets/BaseCommand.java | 18 +-
.../tier/sockets/ClientProxyMembershipID.java | 5 +-
.../cache/versions/RegionVersionVector.java | 6 +-
.../internal/cache/xmlcache/CacheCreation.java | 7 +-
.../internal/datasource/AbstractPoolCache.java | 4 +-
.../internal/logging/log4j/LogMarker.java | 1 -
.../internal/memcached/commands/GetCommand.java | 7 +-
.../internal/statistics/SampleCollector.java | 4 +-
.../gemfire/internal/tcp/Connection.java | 7 +
.../gemfire/internal/tcp/TCPConduit.java | 6 +-
.../gemfire/internal/util/DebuggerSupport.java | 4 +-
.../gemfire/internal/util/SingletonValue.java | 6 +-
.../CustomEntryConcurrentHashMap.java | 8 +-
.../gemfire/management/internal/AgentUtil.java | 56 +--
.../cache30/ClientMembershipDUnitTest.java | 12 +-
.../cache30/ClientServerCCEDUnitTest.java | 2 +-
...tributedAckPersistentRegionCCEDUnitTest.java | 18 +-
.../cache30/DistributedAckRegionDUnitTest.java | 2 +-
.../DistributedNoAckRegionCCEDUnitTest.java | 11 +-
.../gemfire/cache30/MultiVMRegionTestCase.java | 4 +-
.../gemfire/cache30/TXDistributedDUnitTest.java | 2 +-
.../membership/MembershipJUnitTest.java | 29 +-
.../internal/membership/NetViewJUnitTest.java | 194 ++++++++++
.../locator/GMSLocatorRecoveryJUnitTest.java | 4 +-
.../gms/mgr/GMSMembershipManagerJUnitTest.java | 370 +++++++++++++++++++
.../cache/locks/TXLockServiceDUnitTest.java | 2 +-
.../cache/xmlcache/CacheCreationJUnitTest.java | 28 +-
.../test/java/dunit/DistributedTestCase.java | 9 +
.../java/dunit/standalone/ProcessManager.java | 8 -
gradle/dependency-versions.properties | 1 +
60 files changed, 914 insertions(+), 633 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/adcfb646/build.gradle
----------------------------------------------------------------------