ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ntikho...@apache.org
Subject [12/12] ignite git commit: Merge branch 'master' into ignite-gg-10837
Date Thu, 21 Jan 2016 09:04:57 GMT
Merge branch 'master' into ignite-gg-10837


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5af72825
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5af72825
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5af72825

Branch: refs/heads/ignite-gg-10837
Commit: 5af72825ac98248b3849cd24893d70fc93c8e8c6
Parents: afc4c15 d2f84d1
Author: Tikhonov Nikolay <tikhonovnicolay@gmail.com>
Authored: Thu Jan 21 11:58:03 2016 +0300
Committer: Tikhonov Nikolay <tikhonovnicolay@gmail.com>
Committed: Thu Jan 21 11:58:03 2016 +0300

----------------------------------------------------------------------
 .../configuration/CacheConfiguration.java       |   2 +-
 .../processors/cache/GridCacheMvccManager.java  |  43 ++-
 .../processors/cache/GridCacheProcessor.java    |   7 +
 .../distributed/GridCacheTxRecoveryFuture.java  |   2 +-
 .../dht/CacheDistributedGetFutureAdapter.java   |   2 +-
 .../cache/distributed/dht/GridDhtGetFuture.java |   2 +-
 .../distributed/dht/GridDhtLockFuture.java      |   2 +-
 .../distributed/dht/GridDhtTxFinishFuture.java  |   2 +-
 .../colocated/GridDhtColocatedLockFuture.java   |   2 +-
 .../distributed/near/GridNearLockFuture.java    |   2 +-
 ...arOptimisticSerializableTxPrepareFuture.java |  47 ++-
 .../GridNearPessimisticTxPrepareFuture.java     |   6 +-
 .../near/GridNearTxFinishFuture.java            |  29 +-
 .../processors/cluster/ClusterProcessor.java    |  37 ++-
 .../service/GridServiceProcessor.java           |  17 +-
 .../util/future/GridCompoundFuture.java         | 314 +++++--------------
 .../util/future/GridCompoundIdentityFuture.java |   6 +-
 .../internal/util/future/GridFutureAdapter.java |   2 +
 .../ignite/internal/visor/cache/VisorCache.java |  63 ++--
 .../visor/cache/VisorCacheConfiguration.java    |   4 +-
 .../cache/VisorCacheQueryConfiguration.java     |  31 +-
 .../cache/VisorCacheQueryConfigurationV2.java   |  47 +++
 .../cache/VisorCacheStoreConfiguration.java     |  39 +--
 .../cache/VisorCacheStoreConfigurationV2.java   |  48 +++
 .../internal/visor/cache/VisorCacheV2.java      |  73 +++++
 .../visor/node/VisorIgfsConfiguration.java      |  32 +-
 .../visor/node/VisorNodeDataCollectorJob.java   |   5 +-
 .../visor/node/VisorNodeDataCollectorTask.java  |   2 +-
 .../resources/META-INF/classnames.properties    |  15 +-
 .../ignite/testframework/GridTestUtils.java     |   7 +-
 .../Cache/CacheAbstractTest.cs                  |  72 +++--
 .../Impl/Unmanaged/IgniteJniNativeMethods.cs    |   2 +-
 .../Impl/Unmanaged/UnmanagedUtils.cs            |   6 +-
 .../commands/cache/VisorCacheCommand.scala      |  10 +-
 34 files changed, 557 insertions(+), 423 deletions(-)
----------------------------------------------------------------------



Mime
View raw message