Merge branches 'ignite-776' and 'ignite-sprint-4' of http://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-776
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5fbdd404 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5fbdd404 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5fbdd404 Branch: refs/heads/ignite-157-2 Commit: 5fbdd4048cbf67f929719ae547b5ef3953647b8e Parents: 06eaccb 5fb7948 Author: anovikov <anovi...@gridgain.com> Authored: Mon Apr 27 22:23:55 2015 +0700 Committer: anovikov <anovi...@gridgain.com> Committed: Mon Apr 27 22:23:55 2015 +0700 ---------------------------------------------------------------------- .../processors/cache/CacheInvokeResult.java | 24 ++++++++++++++--- .../processors/cache/GridCacheAdapter.java | 2 +- .../processors/cache/GridCacheMapEntry.java | 4 +-- .../processors/cache/GridCacheReturn.java | 5 ++-- .../dht/atomic/GridDhtAtomicCache.java | 3 +-- .../local/atomic/GridLocalAtomicCache.java | 6 ++--- .../ignite/GridSuppressedExceptionSelfTest.java | 4 +-- .../processors/cache/GridCacheOffHeapTest.java | 28 +++++--------------- ...ePartitionedNearDisabledMetricsSelfTest.java | 4 +-- .../GridCacheEvictionFilterSelfTest.java | 4 +-- .../IgniteCacheExpiryPolicyAbstractTest.java | 10 +++---- ...eCacheExpiryPolicyWithStoreAbstractTest.java | 4 +-- .../DataStreamerMultiThreadedSelfTest.java | 19 +++++++++---- .../processors/igfs/IgfsModesSelfTest.java | 4 +-- .../unsafe/GridUnsafeMemorySelfTest.java | 4 +-- .../GridSwapSpaceSpiAbstractSelfTest.java | 2 +- .../apache/ignite/util/GridRandomSelfTest.java | 4 +-- .../HadoopIgfs20FileSystemAbstractSelfTest.java | 4 +-- .../collections/HadoopHashMapSelfTest.java | 4 +-- .../cache/GridCacheCrossCacheQuerySelfTest.java | 8 ++---- .../h2/GridIndexingSpiAbstractSelfTest.java | 4 +-- .../query/h2/sql/BaseH2CompareQueryTest.java | 4 +-- 22 files changed, 69 insertions(+), 86 deletions(-) ----------------------------------------------------------------------
