Merge branch 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-341
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0ada71c9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0ada71c9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0ada71c9 Branch: refs/heads/ignite-494b Commit: 0ada71c95d3950ef4a9b96392e027853719e2093 Parents: d930d6f 567dd9a Author: S.Vladykin <svlady...@gridgain.com> Authored: Mon Mar 23 17:46:10 2015 +0300 Committer: S.Vladykin <svlady...@gridgain.com> Committed: Mon Mar 23 17:46:10 2015 +0300 ---------------------------------------------------------------------- .../hibernate/CacheHibernatePersonStore.java | 6 ++-- .../store/jdbc/CacheJdbcPersonStore.java | 2 +- .../cache/store/CacheLoadOnlyStoreAdapter.java | 2 +- .../apache/ignite/cache/store/CacheStore.java | 2 +- .../ignite/cache/store/CacheStoreAdapter.java | 2 +- .../ignite/cache/store/CacheStoreSession.java | 2 +- .../store/jdbc/CacheAbstractJdbcStore.java | 2 +- .../cache/store/jdbc/CacheJdbcBlobStore.java | 2 +- .../cache/CacheStoreBalancingWrapper.java | 4 +-- .../cache/GridCacheLoaderWriterStore.java | 2 +- .../processors/cache/GridCacheStoreManager.java | 2 +- .../cache/GridCacheWriteBehindStore.java | 2 +- .../transactions/TransactionProxyImpl.java | 17 ---------- .../apache/ignite/transactions/Transaction.java | 29 ----------------- .../store/GridCacheBalancingStoreSelfTest.java | 2 +- .../cache/store/GridGeneratingTestStore.java | 2 +- .../IgniteCacheExpiryStoreLoadSelfTest.java | 2 +- .../GridCacheAbstractLocalStoreSelfTest.java | 2 +- ...idCacheConfigurationConsistencySelfTest.java | 2 +- .../cache/GridCacheGenericTestStore.java | 2 +- .../cache/GridCacheLifecycleAwareSelfTest.java | 2 +- .../cache/GridCacheStorePutxSelfTest.java | 2 +- .../processors/cache/GridCacheTestStore.java | 2 +- .../IgniteTxStoreExceptionAbstractSelfTest.java | 2 +- .../IgniteCrossCacheTxStoreSelfTest.java | 6 ++-- .../IgniteCacheStoreSessionAbstractTest.java | 21 +++++++++--- ...acheStoreSessionWriteBehindAbstractTest.java | 2 +- .../IgniteCacheTxStoreSessionTest.java | 14 ++++---- .../cache/GridAbstractCacheStoreSelfTest.java | 34 ++++++++++---------- .../hibernate/CacheHibernateBlobStore.java | 6 ++-- 30 files changed, 72 insertions(+), 107 deletions(-) ----------------------------------------------------------------------