Merge branches 'ignite-341' and '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/cccaea97 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/cccaea97 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/cccaea97 Branch: refs/heads/ignite-494b Commit: cccaea978e162d8c4bbfb1d090e80090d03b6545 Parents: 57c0925 7161112 Author: S.Vladykin <svlady...@gridgain.com> Authored: Wed Mar 25 11:28:24 2015 +0300 Committer: S.Vladykin <svlady...@gridgain.com> Committed: Wed Mar 25 11:28:24 2015 +0300 ---------------------------------------------------------------------- .../examples/datagrid/CacheQueryExample.java | 39 +++++++++--------- .../GridDistributedCacheAdapter.java | 16 +++++++- .../distributed/near/GridNearCacheEntry.java | 42 +++++++++++++++++++- ...cheNearUpdateTopologyChangeAbstractTest.java | 13 +++++- .../cache/GridCacheAbstractFullApiSelfTest.java | 13 ------ .../GridCacheInterceptorAbstractSelfTest.java | 2 + .../dht/GridCacheAtomicNearCacheSelfTest.java | 30 +++++--------- ...ridCacheContinuousQueryAbstractSelfTest.java | 3 +- .../junits/common/GridCommonAbstractTest.java | 18 +++++++++ .../IgniteCacheFailoverTestSuite.java | 3 ++ .../ignite/testsuites/IgniteCacheTestSuite.java | 1 - 11 files changed, 121 insertions(+), 59 deletions(-) ----------------------------------------------------------------------
