Merge remote-tracking branch 'remotes/origin/sprint-1' into ignite-94

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

Branch: refs/heads/sprint-1
Commit: 2597403bb36d423bc73d465e7a64687942092979
Parents: 9205475 f4ab031
Author: avinogradov <avinogra...@gridgain.com>
Authored: Tue Jan 20 15:48:05 2015 +0300
Committer: avinogradov <avinogra...@gridgain.com>
Committed: Tue Jan 20 15:48:05 2015 +0300

----------------------------------------------------------------------
 assembly/release-base.xml                       |    5 -
 .../main/java/org/apache/ignite/CacheLock.java  |   61 ++
 .../java/org/apache/ignite/IgniteCache.java     |   23 +-
 .../apache/ignite/cache/CacheEntryEvent.java    |   53 +-
 .../processors/cache/CacheLockAsyncImpl.java    |  141 +++
 .../processors/cache/CacheLockImpl.java         |  176 +++
 .../processors/cache/IgniteCacheProxy.java      |  130 +--
 .../grid/cache/GridCacheConfiguration.java      |    1 +
 .../cache/query/GridCacheContinuousQuery.java   |   10 +-
 .../grid/kernal/GridEventConsumeHandler.java    |    2 +-
 .../processors/cache/GridCacheAdapter.java      |   20 +-
 .../processors/cache/GridCacheMapEntry.java     |   70 +-
 .../processors/cache/GridCacheProcessor.java    |    1 -
 .../GridCacheDataStructuresManager.java         |    6 +-
 .../GridCacheContinuousQueryAdapter.java        |   42 +-
 .../GridCacheContinuousQueryEntry.java          |   61 +-
 .../GridCacheContinuousQueryHandler.java        |   96 +-
 .../GridCacheContinuousQueryHandlerV2.java      |   83 --
 .../GridCacheContinuousQueryHandlerV3.java      |   61 --
 .../GridCacheContinuousQueryHandlerV4.java      |   61 --
 .../GridCacheContinuousQueryManager.java        |  513 ++++++++-
 .../continuous/GridContinuousMessage.java       |   52 +-
 .../continuous/GridContinuousMessageType.java   |    5 +-
 .../continuous/GridContinuousProcessor.java     |  181 +++-
 .../service/GridServiceProcessor.java           |    4 +-
 .../IgniteCacheEntryListenerAbstractTest.java   | 1005 ++++++++++++++++++
 ...IgniteCacheEntryListenerAtomicLocalTest.java |   49 +
 ...eCacheEntryListenerAtomicReplicatedTest.java |   32 +
 .../IgniteCacheEntryListenerAtomicTest.java     |   55 +
 ...eCacheEntryListenerEagerTtlDisabledTest.java |   30 +
 .../IgniteCacheEntryListenerTxLocalTest.java    |   49 +
 ...gniteCacheEntryListenerTxReplicatedTest.java |   32 +
 .../cache/IgniteCacheEntryListenerTxTest.java   |   49 +
 .../cache/GridCacheAbstractFullApiSelfTest.java |   55 +-
 .../cache/GridCacheBasicApiAbstractTest.java    |   80 ++
 .../GridCacheMultiNodeLockAbstractTest.java     |   58 +-
 .../dht/GridCacheColocatedDebugTest.java        |   16 +-
 .../near/GridCachePartitionedLockSelfTest.java  |   15 +-
 .../GridCacheLocalMultithreadedSelfTest.java    |   47 +-
 .../junits/common/GridCommonAbstractTest.java   |   13 +
 .../bamboo/GridDataGridTestSuite.java           |    8 +
 41 files changed, 2952 insertions(+), 499 deletions(-)
----------------------------------------------------------------------


Reply via email to