ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yzhda...@apache.org
Subject [22/27] incubator-ignite git commit: Merge branches 'ignite-105' and 'sprint-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-105
Date Wed, 21 Jan 2015 17:30:44 GMT
Merge branches 'ignite-105' and 'sprint-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite
into ignite-105

Conflicts:
	assembly/release-base.xml


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

Branch: refs/heads/ignite-53
Commit: f10f5db7d8fa64010704fca86513e797924f4695
Parents: 1164ff2 09c52dd
Author: Yakov Zhdanov <yzhdanov@gridgain.com>
Authored: Wed Jan 21 18:58:05 2015 +0300
Committer: Yakov Zhdanov <yzhdanov@gridgain.com>
Committed: Wed Jan 21 18:58:05 2015 +0300

----------------------------------------------------------------------
 assembly/release-base.xml                       |   5 +
 docs/core-site.gridgain.xml                     |  21 ++
 .../main/java/org/apache/ignite/CacheLock.java  |  61 ----
 .../java/org/apache/ignite/IgniteCache.java     |   1 -
 .../java/org/apache/ignite/cache/CacheLock.java |  62 ++++
 .../cache/CachePartialUpdateException.java      |  22 +-
 .../processors/cache/CacheLockAsyncImpl.java    |   2 +-
 .../processors/cache/CacheLockImpl.java         |   1 +
 .../processors/cache/CacheInvokeEntry.java      |  22 +-
 .../processors/cache/CacheInvokeResult.java     |  22 +-
 .../cache/IgniteCacheExpiryPolicy.java          |  22 +-
 .../distributed/GridCacheTtlUpdateRequest.java  |  22 +-
 .../IgniteExternalizableExpiryPolicy.java       |  22 +-
 .../cache/IgniteCacheAbstractTest.java          |  22 +-
 .../cache/IgniteCacheAtomicInvokeTest.java      |  22 +-
 .../cache/IgniteCacheAtomicLocalInvokeTest.java |  22 +-
 ...niteCacheAtomicLocalWithStoreInvokeTest.java |  22 +-
 .../IgniteCacheAtomicNearEnabledInvokeTest.java |  22 +-
 ...eCacheAtomicPrimaryWriteOrderInvokeTest.java |  22 +-
 ...micPrimaryWriteOrderWithStoreInvokeTest.java |  22 +-
 .../cache/IgniteCacheInvokeAbstractTest.java    |  22 +-
 .../cache/IgniteCacheTxInvokeTest.java          |  22 +-
 .../cache/IgniteCacheTxLocalInvokeTest.java     |  22 +-
 .../IgniteCacheTxNearEnabledInvokeTest.java     |  22 +-
 .../IgniteCacheAtomicExpiryPolicyTest.java      |  22 +-
 .../IgniteCacheAtomicLocalExpiryPolicyTest.java |  22 +-
 ...AtomicPrimaryWriteOrderExpiryPolicyTest.java |  22 +-
 ...maryWriteOrderWithStoreExpiryPolicyTest.java |  22 +-
 ...teCacheAtomicReplicatedExpiryPolicyTest.java |  22 +-
 ...iteCacheAtomicWithStoreExpiryPolicyTest.java |  22 +-
 .../IgniteCacheExpiryPolicyAbstractTest.java    |  22 +-
 .../IgniteCacheExpiryPolicyTestSuite.java       |  22 +-
 .../expiry/IgniteCacheTxExpiryPolicyTest.java   |  22 +-
 .../IgniteCacheTxLocalExpiryPolicyTest.java     |  22 +-
 ...IgniteCacheTxReplicatedExpiryPolicyTest.java |  22 +-
 .../IgniteCacheTxWithStoreExpiryPolicyTest.java |  22 +-
 .../cache/GridCacheAbstractFullApiSelfTest.java |   1 +
 .../GridCacheMultiNodeLockAbstractTest.java     |   3 +-
 .../dht/GridCacheColocatedDebugTest.java        |   1 +
 .../dht/GridCacheGlobalLoadTest.java            |  22 +-
 .../near/GridCachePartitionedLockSelfTest.java  |   2 +-
 .../GridCacheLocalMultithreadedSelfTest.java    |   1 +
 ...heGgfsPerBlockLruEvictionPolicySelfTest.java |  15 +-
 .../ggfs/GridGgfsAbstractSelfTest.java          |  20 +-
 .../ggfs/GridGgfsMetricsSelfTest.java           |  10 +-
 .../processors/ggfs/GridGgfsModesSelfTest.java  |   6 +-
 ...IpcEndpointRegistrationAbstractSelfTest.java |  33 +-
 ...dpointRegistrationOnLinuxAndMacSelfTest.java |   6 +-
 ...pcEndpointRegistrationOnWindowsSelfTest.java |   4 +-
 ...idIpcServerEndpointDeserializerSelfTest.java |  76 ++---
 .../testframework/GridGgfsTestUtils.java        |  55 ----
 .../counter/GridHadoopFSCounterWriter.java      |   4 +-
 .../counter/GridHadoopPerformanceCounter.java   |  18 +-
 .../v2/GridHadoopV2JobResourceManager.java      |  13 +-
 .../grid/ggfs/GridGgfsEventsTestSuite.java      |  26 +-
 ...dGgfsHadoop20FileSystemAbstractSelfTest.java |   9 +-
 ...doop20FileSystemLoopbackPrimarySelfTest.java |  11 +-
 ...sHadoop20FileSystemShmemPrimarySelfTest.java |  11 +-
 .../GridGgfsHadoopDualAbstractSelfTest.java     |  19 +-
 ...ridGgfsHadoopFileSystemAbstractSelfTest.java |  15 +-
 .../GridGgfsHadoopFileSystemClientSelfTest.java |   6 +-
 ...idGgfsHadoopFileSystemHandshakeSelfTest.java |   7 +-
 ...ridGgfsHadoopFileSystemIpcCacheSelfTest.java |   7 +-
 ...GgfsHadoopFileSystemLoggerStateSelfTest.java |   7 +-
 ...adoopFileSystemLoopbackAbstractSelfTest.java |   9 +-
 ...fsHadoopFileSystemSecondaryModeSelfTest.java |  12 +-
 ...fsHadoopFileSystemShmemAbstractSelfTest.java |   7 +-
 .../ggfs/GridGgfsNearOnlyMultiNodeSelfTest.java |   7 +-
 .../grid/hadoop/GridHadoopTestUtils.java        |  20 +-
 .../hadoop/GridHadoopCommandLineTest.java       |   2 +-
 .../hadoop/GridHadoopMapReduceTest.java         |   5 +-
 .../grid/cache/spring/GridSpringCache.java      | 185 +++++++++++
 .../cache/spring/GridSpringCacheManager.java    | 190 ++---------
 .../spring/GridSpringDynamicCacheManager.java   | 316 +++++++++++++++++++
 .../spring/GridSpringCacheManagerSelfTest.java  |   2 +-
 .../GridSpringDynamicCacheManagerSelfTest.java  | 218 +++++++++++++
 .../GridSpringDynamicCacheTestService.java      |  62 ++++
 .../cache/spring/spring-dynamic-caching.xml     |  43 +++
 .../testsuites/bamboo/GridSpringTestSuite.java  |   1 +
 79 files changed, 1634 insertions(+), 644 deletions(-)
----------------------------------------------------------------------



Mime
View raw message