Merge branch 'sprint-1' into ignite-49

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

Branch: refs/heads/ignite-49
Commit: 1fd63cde854538ded2784bb535cd0c0cb2ab3ba6
Parents: b85a35f 09c52dd
Author: nikolay_tikhonov <ntikho...@gridgain.com>
Authored: Wed Jan 21 18:49:10 2015 +0300
Committer: nikolay_tikhonov <ntikho...@gridgain.com>
Committed: Wed Jan 21 18:49:10 2015 +0300

----------------------------------------------------------------------
 docs/core-site.gridgain.xml                     |  21 ++
 .../cache/CachePartialUpdateException.java      |  22 +-
 .../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 +-
 .../dht/GridCacheGlobalLoadTest.java            |  22 +-
 ...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 +
 68 files changed, 1560 insertions(+), 578 deletions(-)
----------------------------------------------------------------------


Reply via email to