Merge remote-tracking branch 'remotes/origin/master' into ignite-1607
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a5103a87 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a5103a87 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a5103a87 Branch: refs/heads/ignite-1607 Commit: a5103a87b9ef9f50f6b039f2eeddef7ad36f1f19 Parents: 3ed37b2 8616889 Author: sboikov <[email protected]> Authored: Mon Oct 5 08:58:16 2015 +0300 Committer: sboikov <[email protected]> Committed: Mon Oct 5 08:58:16 2015 +0300 ---------------------------------------------------------------------- modules/apache-license-gen/README.txt | 33 ++++ .../org/apache/ignite/IgniteFileSystem.java | 2 + .../discovery/GridDiscoveryManager.java | 2 +- .../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 +- .../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 +++++++++++++++++- .../cache/IgniteCachePutAllRestartTest.java | 4 +- .../CacheGetFutureHangsSelfTest.java | 156 ++++++++-------- .../distributed/IgniteCacheCreatePutTest.java | 125 +++++++++++++ .../dht/GridNearCacheTxNodeFailureSelfTest.java | 4 + .../processors/igfs/IgfsAbstractSelfTest.java | 185 +++++++++++-------- .../testsuites/IgniteCacheTestSuite4.java | 5 + 21 files changed, 621 insertions(+), 309 deletions(-) ----------------------------------------------------------------------
