ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From voze...@apache.org
Subject [2/5] ignite git commit: Merge branch 'ignite-1.4' of https://github.com/apache/ignite into ignite-586
Date Fri, 18 Sep 2015 08:11:42 GMT
Merge branch 'ignite-1.4' of https://github.com/apache/ignite into ignite-586


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

Branch: refs/heads/ignite-586
Commit: 669c060da98e93b5ec79f20993dab887be9b6139
Parents: f61b92a 585761f
Author: iveselovskiy <iveselovskiy@gridgain.com>
Authored: Thu Sep 17 17:33:02 2015 +0300
Committer: iveselovskiy <iveselovskiy@gridgain.com>
Committed: Thu Sep 17 17:33:02 2015 +0300

----------------------------------------------------------------------
 .../apache/ignite/internal/IgniteKernal.java    |   7 -
 .../processors/cache/GridCacheContext.java      |   6 +-
 .../cache/GridCacheEvictionManager.java         |   6 +-
 .../cache/GridCacheEvictionResponse.java        |   2 +-
 .../processors/cache/GridCacheIoManager.java    |  47 ++--
 .../processors/cache/GridCacheMessage.java      |   7 +
 .../processors/cache/GridCacheMvccManager.java  |  34 ++-
 .../GridCachePartitionExchangeManager.java      |  41 +++-
 .../processors/cache/GridCacheProcessor.java    |  28 ++-
 .../GridDistributedLockResponse.java            |   6 +-
 .../GridDistributedTxPrepareResponse.java       |   6 +-
 .../distributed/dht/GridDhtLocalPartition.java  |  26 +-
 .../distributed/dht/GridDhtTopologyFuture.java  |   6 +-
 .../dht/GridDhtTransactionalCacheAdapter.java   |   2 +-
 .../dht/atomic/GridDhtAtomicUpdateResponse.java |  12 +-
 .../dht/atomic/GridNearAtomicUpdateFuture.java  |  16 +-
 .../dht/atomic/GridNearAtomicUpdateRequest.java |   2 +
 .../atomic/GridNearAtomicUpdateResponse.java    |  11 +-
 .../colocated/GridDhtColocatedLockFuture.java   |  44 +++-
 .../dht/preloader/GridDhtForceKeysFuture.java   |   2 +-
 .../dht/preloader/GridDhtForceKeysResponse.java |   6 +-
 .../GridDhtPartitionsExchangeFuture.java        |  19 +-
 .../distributed/near/GridNearGetResponse.java   |   6 +-
 .../distributed/near/GridNearLockFuture.java    |  26 +-
 .../near/GridNearOptimisticTxPrepareFuture.java |  20 +-
 .../near/GridNearTxFinishResponse.java          |   6 +-
 .../query/GridCacheDistributedQueryFuture.java  |  27 +-
 .../cache/query/GridCacheLocalQueryFuture.java  |   5 +
 .../cache/query/GridCacheQueryAdapter.java      | 170 ++++++++-----
 .../query/GridCacheQueryFutureAdapter.java      |  11 +-
 .../cache/query/GridCacheQueryManager.java      |  30 ++-
 .../cache/query/GridCacheQueryResponse.java     |   6 +-
 .../continuous/CacheContinuousQueryHandler.java |  12 +-
 .../transactions/IgniteTxLocalAdapter.java      |   4 +-
 .../ignite/internal/util/GridSpinBusyLock.java  |  10 +
 .../IgniteCacheEntryProcessorNodeJoinTest.java  |  24 +-
 .../distributed/CacheAffEarlySelfTest.java      | 245 +++++++++++++++++++
 .../GridCacheSwapScanQueryAbstractSelfTest.java | 118 ++++-----
 .../loadtests/hashmap/GridCacheTestContext.java |   4 +-
 ...CacheScanPartitionQueryFallbackSelfTest.java | 224 +++++------------
 .../IgniteCacheQueryNodeRestartSelfTest2.java   |   2 -
 .../ignite/visor/commands/VisorConsole.scala    |  37 ++-
 42 files changed, 863 insertions(+), 460 deletions(-)
----------------------------------------------------------------------



Mime
View raw message