Merge remote-tracking branch 'apache/ignite-1.4' into ignite-1.4
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e4e39af6 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e4e39af6 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e4e39af6 Branch: refs/heads/ignite-1093-2 Commit: e4e39af68d1546b99d2ffe367ca1f3ba840db501 Parents: 108dd8f b8db248 Author: ashutak <[email protected]> Authored: Tue Sep 8 19:34:08 2015 +0300 Committer: ashutak <[email protected]> Committed: Tue Sep 8 19:34:08 2015 +0300 ---------------------------------------------------------------------- .../store/jdbc/CacheJdbcPojoStoreFactory.java | 2 +- .../cache/GridCacheMvccCandidate.java | 2 +- .../processors/igfs/IgfsDataManager.java | 14 ++-- .../ignite/GridSuppressedExceptionSelfTest.java | 22 ------- ...cheAbstractFullApiMultithreadedSelfTest.java | 69 ++++++++++++-------- ...dCacheQueueMultiNodeConsistencySelfTest.java | 58 +++++++++------- .../GridCacheSetFailoverAbstractSelfTest.java | 2 - ...PartitionedFullApiMultithreadedSelfTest.java | 5 -- ...eReplicatedFullApiMultithreadedSelfTest.java | 5 -- ...dCacheLocalFullApiMultithreadedSelfTest.java | 5 -- .../unsafe/GridUnsafeMemoryPerformanceTest.java | 65 ++++++++++++++++++ .../unsafe/GridUnsafeMemorySelfTest.java | 38 ----------- .../h2/GridIndexingSpiAbstractSelfTest.java | 13 ---- 13 files changed, 150 insertions(+), 150 deletions(-) ----------------------------------------------------------------------
