You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by kl...@apache.org on 2015/12/14 19:07:21 UTC
[48/48] incubator-geode git commit: Merge remote-tracking branch
'origin/develop' into feature/GEODE-217
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/afed6657
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/afed6657
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/afed6657
Branch: refs/heads/feature/GEODE-217
Commit: afed665770187d554f24ca84670cbc6a02c9d35e
Parents: 0e62bc0 ec9d16a
Author: Kirk Lund <kl...@pivotal.io>
Authored: Mon Dec 14 10:05:31 2015 -0800
Committer: Kirk Lund <kl...@pivotal.io>
Committed: Mon Dec 14 10:05:31 2015 -0800
----------------------------------------------------------------------
build.gradle | 21 +-
gemfire-assembly/build.gradle | 17 +
gemfire-assembly/src/main/dist/bin/gfsh | 14 +
.../src/main/dist/bin/gfsh-completion.bash | 15 +
gemfire-assembly/src/main/dist/bin/gfsh.bat | 14 +
.../LocatorLauncherAssemblyJUnitTest.java | 157 ++
.../SharedConfigurationEndToEndDUnitTest.java | 21 +-
gemfire-common/build.gradle | 17 +
gemfire-core/build.gradle | 17 +
gemfire-core/src/jca/ra.xml | 17 +-
.../DistributedSystemHealthEvaluator.java | 2 +-
.../client/doc-files/example-client-cache.xml | 16 +
.../gemfire/cache/doc-files/example-cache.xml | 16 +
.../gemfire/cache/doc-files/example2-cache.xml | 17 +
.../gemfire/cache/doc-files/example3-cache.xml | 16 +
.../cache/query/internal/parse/fixantlr.sh | 15 +
.../gemfire/cache/query/internal/parse/oql.g | 17 +
.../gemfire/distributed/AbstractLauncher.java | 2 +-
.../gemfire/distributed/DistributedSystem.java | 208 ++-
.../gemfire/distributed/internal/DMStats.java | 1 +
.../internal/DistributionAdvisor.java | 2 +-
.../internal/DistributionManager.java | 24 +-
.../distributed/internal/DistributionStats.java | 3 +
.../internal/InternalDistributedSystem.java | 19 +-
.../internal/LonerDistributionManager.java | 2 +
.../internal/MembershipListener.java | 3 +-
.../distributed/internal/ProductUseLog.java | 2 +-
.../distributed/internal/ReplyProcessor21.java | 4 +-
.../internal/direct/DirectChannel.java | 2 +-
.../internal/direct/DirectChannelListener.java | 16 +
.../internal/locks/DLockGrantor.java | 2 +-
.../DistributedMembershipListener.java | 3 +-
.../internal/membership/MembershipManager.java | 18 +-
.../internal/membership/NetView.java | 19 +
.../internal/membership/gms/GMSMember.java | 8 +
.../internal/membership/gms/ServiceConfig.java | 21 +-
.../internal/membership/gms/Services.java | 12 +-
.../internal/membership/gms/SuspectMember.java | 9 +-
.../membership/gms/auth/GMSAuthenticator.java | 2 +-
.../membership/gms/fd/GMSHealthMonitor.java | 38 +-
.../membership/gms/interfaces/Messenger.java | 22 +
.../membership/gms/interfaces/Service.java | 3 +-
.../gms/locator/FindCoordinatorRequest.java | 33 +
.../membership/gms/membership/GMSJoinLeave.java | 165 +-
.../gms/messenger/JGroupsMessenger.java | 71 +-
.../gms/mgr/GMSMembershipManager.java | 45 +-
.../gemfire/internal/AbstractConfig.java | 4 -
.../admin/remote/RemoteGfManagerAgent.java | 2 +-
.../internal/cache/DistributedRegion.java | 2 +-
.../internal/cache/InitialImageFlowControl.java | 2 +-
.../internal/cache/PRHARedundancyProvider.java | 4 +-
.../internal/cache/PartitionedRegion.java | 2 +-
.../internal/cache/PartitionedRegionHelper.java | 2 +-
.../cache/SearchLoadAndWriteProcessor.java | 2 +-
.../internal/cache/StateFlushOperation.java | 6 +-
.../gemfire/internal/cache/TXCommitMessage.java | 2 +-
.../internal/cache/TXFarSideCMTracker.java | 2 +-
.../gemfire/internal/cache/TXManagerImpl.java | 2 +-
.../internal/cache/lru/NewLIFOClockHand.java | 78 +-
.../internal/cache/lru/NewLRUClockHand.java | 14 +-
.../PartitionedRegionRebalanceOp.java | 2 +-
.../cache/persistence/BackupManager.java | 2 +-
.../persistence/PersistenceAdvisorImpl.java | 2 +-
.../persistence/PersistentMemberManager.java | 2 +-
.../cache/versions/RegionVersionVector.java | 2 +-
.../gemfire/internal/offheap/DataAsAddress.java | 14 +-
.../offheap/OffHeapRegionEntryHelper.java | 51 +-
.../internal/offheap/RefCountChangeInfo.java | 77 +-
.../internal/offheap/ReferenceCountHelper.java | 14 +-
.../gemfire/internal/tcp/Connection.java | 6 +-
.../gemfire/internal/tcp/ConnectionTable.java | 2 +-
.../gemfire/internal/tcp/TCPConduit.java | 2 +-
.../management/internal/FederatingManager.java | 5 +-
.../internal/ManagementMembershipListener.java | 4 +-
.../internal/SystemManagementService.java | 7 +-
.../internal/beans/MBeanAggregator.java | 2 +-
.../tools/gfsh/app/windowsbindings.properties | 15 +
.../DistributedMulticastRegionDUnitTest.java | 213 +++
.../AbstractLauncherIntegrationJUnitTest.java | 71 +
.../distributed/AbstractLauncherJUnitTest.java | 39 +-
.../distributed/CommonLauncherTestSuite.java | 65 -
.../DistributedSystemIntegrationJUnitTest.java | 91 +
.../distributed/DistributedSystemJUnitTest.java | 78 +
.../gemfire/distributed/LocatorDUnitTest.java | 9 +-
.../LocatorLauncherIntegrationJUnitTest.java | 248 +++
.../distributed/LocatorLauncherJUnitTest.java | 154 +-
.../ServerLauncherIntegrationJUnitTest.java | 312 ++++
.../distributed/ServerLauncherJUnitTest.java | 183 +-
.../internal/DistributionManagerDUnitTest.java | 43 +-
.../membership/MembershipJUnitTest.java | 130 +-
.../internal/membership/NetViewJUnitTest.java | 82 +-
.../membership/gms/GMSMemberJUnitTest.java | 16 +
.../gms/fd/GMSHealthMonitorJUnitTest.java | 111 +-
.../gms/membership/GMSJoinLeaveJUnitTest.java | 150 +-
.../messenger/JGroupsMessengerJUnitTest.java | 64 +-
.../gms/mgr/GMSMembershipManagerJUnitTest.java | 82 +-
.../internal/AbstractConfigJUnitTest.java | 114 ++
.../internal/DataSerializableJUnitTest.java | 35 +-
...victionAlgoMemoryEnabledRegionJUnitTest.java | 119 ++
.../InstantiatorPropagationDUnitTest.java | 16 +
.../cache/wan/AsyncEventQueueTestBase.java | 20 +-
.../asyncqueue/AsyncEventListenerDUnitTest.java | 21 +-
.../AsyncEventListenerOffHeapDUnitTest.java | 16 +
.../AsyncEventQueueStatsDUnitTest.java | 21 +-
.../ConcurrentAsyncEventQueueDUnitTest.java | 24 +-
...ncurrentAsyncEventQueueOffHeapDUnitTest.java | 16 +
.../CommonParallelAsyncEventQueueDUnitTest.java | 24 +-
...ParallelAsyncEventQueueOffHeapDUnitTest.java | 16 +
.../offheap/AbstractStoredObjectTestBase.java | 203 +++
.../offheap/DataAsAddressJUnitTest.java | 368 +++++
.../offheap/LifecycleListenerJUnitTest.java | 222 +++
.../offheap/RefCountChangeInfoJUnitTest.java | 140 +-
...moryAllocatorLifecycleListenerJUnitTest.java | 147 --
.../internal/cli/GfshParserJUnitTest.java | 50 +-
.../internal/cli/HeadlessGfshJUnitTest.java | 7 +-
.../cli/commands/MemberCommandsDUnitTest.java | 1 +
.../test/process/ProcessOutputReader.java | 101 +-
.../test/process/ProcessStreamReader.java | 42 +-
.../gemfire/test/process/ProcessWrapper.java | 10 +-
.../ClientCacheFactoryJUnitTest_single_pool.xml | 17 +
.../gemfire/cache/query/dunit/IndexCreation.xml | 17 +
.../functional/index-creation-with-eviction.xml | 17 +
.../index-creation-without-eviction.xml | 17 +
.../functional/index-recovery-overflow.xml | 17 +
.../query/internal/index/cachequeryindex.xml | 17 +
.../internal/index/cachequeryindexwitherror.xml | 17 +
.../cache/query/partitioned/PRIndexCreation.xml | 17 +
.../gemfire/cache30/attributesUnordered.xml | 17 +
.../com/gemstone/gemfire/cache30/badFloat.xml | 17 +
.../com/gemstone/gemfire/cache30/badInt.xml | 17 +
.../gemfire/cache30/badKeyConstraintClass.xml | 17 +
.../com/gemstone/gemfire/cache30/badScope.xml | 17 +
.../com/gemstone/gemfire/cache30/bug44710.xml | 17 +
.../gemfire/cache30/callbackNotDeclarable.xml | 17 +
.../gemfire/cache30/callbackWithException.xml | 17 +
.../com/gemstone/gemfire/cache30/coLocation.xml | 17 +
.../gemstone/gemfire/cache30/coLocation3.xml | 17 +
.../com/gemstone/gemfire/cache30/ewtest.xml | 17 +
.../cache30/examples_3_0/example-cache.xml | 16 +
.../cache30/examples_4_0/example-cache.xml | 16 +
.../gemfire/cache30/loaderNotLoader.xml | 17 +
.../com/gemstone/gemfire/cache30/malformed.xml | 17 +
.../gemfire/cache30/namedAttributes.xml | 17 +
.../gemfire/cache30/partitionedRegion.xml | 17 +
.../gemfire/cache30/partitionedRegion51.xml | 17 +
.../gemstone/gemfire/cache30/sameRootRegion.xml | 17 +
.../gemstone/gemfire/cache30/sameSubregion.xml | 17 +
.../gemfire/cache30/unknownNamedAttributes.xml | 17 +
.../internal/SharedConfigurationJUnitTest.xml | 17 +
.../internal/cache/BackupJUnitTest.cache.xml | 17 +
.../internal/cache/DiskRegCacheXmlJUnitTest.xml | 16 +
.../cache/PartitionRegionCacheExample1.xml | 17 +
.../cache/PartitionRegionCacheExample2.xml | 17 +
.../incorrect_bytes_threshold.xml | 17 +
.../faultyDiskXMLsForTesting/incorrect_dir.xml | 17 +
.../incorrect_dir_size.xml | 17 +
.../incorrect_max_oplog_size.xml | 17 +
.../incorrect_roll_oplogs_value.xml | 17 +
.../incorrect_sync_value.xml | 17 +
.../incorrect_time_interval.xml | 17 +
.../mixed_diskstore_diskdir.xml | 17 +
.../mixed_diskstore_diskwriteattrs.xml | 17 +
.../tier/sockets/RedundancyLevelJUnitTest.xml | 16 +
...testDTDFallbackWithNonEnglishLocal.cache.xml | 17 +
.../gemstone/gemfire/internal/jta/cachejta.xml | 17 +
.../src/test/resources/jta/cachejta.xml | 17 +
.../resources/spring/spring-gemfire-context.xml | 17 +
gemfire-lucene/build.gradle | 17 +
...erIntegrationJUnitTest.createIndex.cache.xml | 17 +
...serIntegrationJUnitTest.parseIndex.cache.xml | 17 +
gemfire-rebalancer/build.gradle | 17 +
gemfire-site/.gitignore | 1 +
.../content/bootstrap/bootstrap.min.css | 9 -
gemfire-site/content/community/index.html | 629 -------
.../content/css/bootflat-extensions.css | 356 ----
gemfire-site/content/css/bootflat-square.css | 69 -
gemfire-site/content/css/bootflat.css | 1559 ------------------
gemfire-site/content/css/font-awesome.min.css | 405 -----
gemfire-site/content/css/geode-site.css | 1554 -----------------
gemfire-site/content/css/usergrid-site.css | 1554 -----------------
gemfire-site/content/favicon.ico | Bin 20805 -> 0 bytes
gemfire-site/content/font/FontAwesome.otf | Bin 61896 -> 0 bytes
.../content/font/fontawesome-webfont-eot.eot | Bin 37405 -> 0 bytes
.../content/font/fontawesome-webfont-svg.svg | 399 -----
.../content/font/fontawesome-webfont-ttf.ttf | Bin 79076 -> 0 bytes
.../content/font/fontawesome-webfont-woff.woff | Bin 43572 -> 0 bytes
gemfire-site/content/img/apache_geode_logo.png | Bin 23616 -> 0 bytes
.../content/img/apache_geode_logo_white.png | Bin 22695 -> 0 bytes
.../img/apache_geode_logo_white_small.png | Bin 52948 -> 0 bytes
gemfire-site/content/img/check_flat/default.png | Bin 25851 -> 0 bytes
gemfire-site/content/img/egg-logo.png | Bin 9938 -> 0 bytes
gemfire-site/content/img/github.png | Bin 8936 -> 0 bytes
gemfire-site/content/index.html | 295 ----
gemfire-site/content/js/bootstrap.min.js | 8 -
gemfire-site/content/js/head.js | 708 --------
gemfire-site/content/js/html5shiv.js | 8 -
gemfire-site/content/js/jquery-1.10.1.min.js | 6 -
gemfire-site/content/js/jquery.icheck.js | 397 -----
gemfire-site/content/js/respond.min.js | 6 -
gemfire-site/content/js/usergrid-site.js | 50 -
gemfire-site/content/releases/index.html | 239 ---
gemfire-site/content/static/github-btn.html | 2 -
gemfire-site/website/Rules | 19 +-
gemfire-site/website/build.sh | 17 +
.../website/content/community/index.html | 16 +
gemfire-site/website/content/css/geode-site.css | 16 +
gemfire-site/website/content/index.html | 16 +
.../website/content/js/bootstrap.min.js | 2 +-
.../website/content/js/usergrid-site.js | 20 +-
.../website/content/releases/index.html | 17 +
gemfire-site/website/layouts/header.html | 16 +
gemfire-site/website/lib/default.rb | 33 +-
gemfire-site/website/lib/helpers_.rb | 16 +
gemfire-site/website/lib/pandoc.template | 2 +-
gemfire-site/website/nanoc.yaml | 17 +
gemfire-site/website/run.sh | 17 +
gemfire-site/website/utilities/map-markers.rb | 17 +
.../website/utilities/snapshot-apigee.rb | 17 +
gemfire-site/website/utilities/usergrid.csv | 290 ----
.../src/it/resources/test-regions.xml | 17 +
.../src/it/resources/test-retrieve-regions.xml | 17 +
gemfire-web-api/build.gradle | 17 +
gemfire-web/build.gradle | 17 +
gradle.properties | 14 +
gradle/dependency-versions.properties | 21 +-
gradle/rat.gradle | 152 ++
settings.gradle | 16 +
227 files changed, 5518 insertions(+), 9810 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/afed6657/build.gradle
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/afed6657/gradle/dependency-versions.properties
----------------------------------------------------------------------
diff --cc gradle/dependency-versions.properties
index 160ff5b,8ea38c3..3833f54
--- a/gradle/dependency-versions.properties
+++ b/gradle/dependency-versions.properties
@@@ -6,8 -21,8 +21,8 @@@ activation.version = 1.1.
annotations.version = 3.0.0
antlr.version = 2.7.7
asm.version = 5.0.3
- assertj-core.version = 3.1.0
- awaitility.version = 1.6.5
+ assertj-core.version = 3.2.0
-awaitility.version = 1.6.5
++awaitility.version = 1.7.0
bcel.version = 5.2
catch-exception.version = 1.4.4
catch-throwable.version = 1.4.4
@@@ -64,4 -79,4 +79,4 @@@ stephenc-findbugs.version = 1.3.9-
spymemcached.version = 2.9.0
swagger.version = 1.3.2
swagger-springmvc.version = 0.8.2
--system-rules.version = 1.12.1
++system-rules.version = 1.15.0