Merge remote-tracking branch 'remotes/origin/ignite-sprint-4' into ignite-646
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7814b53c Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7814b53c Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7814b53c Branch: refs/heads/ignite-460 Commit: 7814b53ca63325d33d2340563f00b0c5a06355c2 Parents: a554779 5fb7948 Author: avinogradov <avinogra...@gridgain.com> Authored: Mon Apr 27 17:47:15 2015 +0300 Committer: avinogradov <avinogra...@gridgain.com> Committed: Mon Apr 27 17:47:15 2015 +0300 ---------------------------------------------------------------------- .../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 ++-- .../top/GridTopologyCommandHandler.java | 3 +- .../DataStreamerMultiThreadedSelfTest.java | 19 +++++++++--- .../GridSwapSpaceSpiAbstractSelfTest.java | 2 +- .../query/h2/sql/BaseH2CompareQueryTest.java | 32 ++++++++++---------- 10 files changed, 63 insertions(+), 37 deletions(-) ----------------------------------------------------------------------
