Merge master into ignite-1168
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5ef7c38f Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5ef7c38f Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5ef7c38f Branch: refs/heads/ignite-1168 Commit: 5ef7c38f1ca6b8e075b59000dc48731c260a2a41 Parents: 6e0f415 f025714 Author: Andrey <anovi...@gridgain.com> Authored: Thu Oct 8 10:01:27 2015 +0700 Committer: Andrey <anovi...@gridgain.com> Committed: Thu Oct 8 10:01:27 2015 +0700 ---------------------------------------------------------------------- RELEASE_NOTES.txt | 2 + assembly/dependencies-fabric.xml | 2 +- assembly/release-fabric.xml | 10 +- examples/schema-import/pom-standalone.xml | 90 +++++ examples/schema-import/pom.xml | 13 +- modules/apache-license-gen/README.txt | 33 ++ .../JettyRestProcessorAbstractSelfTest.java | 25 +- .../org/apache/ignite/IgniteFileSystem.java | 2 + .../apache/ignite/IgniteSystemProperties.java | 3 + .../discovery/GridDiscoveryManager.java | 4 +- .../cache/DynamicCacheDescriptor.java | 17 + .../processors/cache/GridCacheContext.java | 2 +- .../processors/cache/GridCacheMvccManager.java | 20 +- .../GridCachePartitionExchangeManager.java | 72 +--- .../processors/cache/GridCacheProcessor.java | 26 +- .../cache/distributed/dht/GridDhtGetFuture.java | 4 +- .../distributed/dht/GridDhtLockRequest.java | 5 +- .../dht/GridPartitionedGetFuture.java | 5 +- .../dht/atomic/GridNearAtomicUpdateFuture.java | 9 +- .../distributed/near/GridNearGetFuture.java | 2 + .../internal/processors/igfs/IgfsFileInfo.java | 13 +- .../internal/processors/igfs/IgfsImpl.java | 64 +--- .../processors/igfs/IgfsMetaManager.java | 180 +++++++++- .../processors/rest/GridRestProcessor.java | 354 +++++++++++++++++-- .../ignite/internal/util/IgniteUtils.java | 2 +- .../GridCacheDeploymentOffHeapSelfTest.java | 15 + .../cache/IgniteCacheEntryListenerTxTest.java | 4 + .../cache/IgniteCachePutAllRestartTest.java | 4 +- .../CacheGetFutureHangsSelfTest.java | 156 ++++---- .../distributed/IgniteCacheCreatePutTest.java | 125 +++++++ .../dht/GridNearCacheTxNodeFailureSelfTest.java | 4 + .../near/GridCacheNearTxExceptionSelfTest.java | 4 + ...bledFairAffinityMultiJvmFullApiSelfTest.java | 5 + ...tomicNearEnabledMultiJvmFullApiSelfTest.java | 5 + .../DataStreamerMultiThreadedSelfTest.java | 4 +- .../DataStreamerMultinodeCreateCacheTest.java | 2 + .../processors/igfs/IgfsAbstractSelfTest.java | 185 ++++++---- .../tcp/TcpClientDiscoverySpiSelfTest.java | 2 + .../testsuites/IgniteCacheTestSuite4.java | 5 + .../ignite/igfs/Hadoop1DualAbstractTest.java | 5 + modules/yardstick/pom.xml | 10 +- pom.xml | 9 +- 42 files changed, 1134 insertions(+), 369 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/5ef7c38f/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/5ef7c38f/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/5ef7c38f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/5ef7c38f/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java ----------------------------------------------------------------------
