You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2015/06/16 14:55:24 UTC
[4/4] incubator-ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-sprint-6' into ignite-gg-10411
Merge remote-tracking branch 'remotes/origin/ignite-sprint-6' into ignite-gg-10411
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/dbd80471
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/dbd80471
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/dbd80471
Branch: refs/heads/ignite-gg-10411
Commit: dbd80471f6e0513e0c1d7b5d1d87347ebe099a93
Parents: 207e2c7 5b9013f
Author: ptupitsyn <pt...@gridgain.com>
Authored: Tue Jun 16 15:55:11 2015 +0300
Committer: ptupitsyn <pt...@gridgain.com>
Committed: Tue Jun 16 15:55:11 2015 +0300
----------------------------------------------------------------------
.../processors/query/GridQueryProcessor.java | 102 ++++++---
.../apache/ignite/internal/GridSelfTest.java | 12 +-
.../GridCacheAbstractFailoverSelfTest.java | 2 +
...CacheP2pUnmarshallingRebalanceErrorTest.java | 15 +-
.../junits/common/GridCommonAbstractTest.java | 11 +-
.../IgniteCacheFailoverTestSuite.java | 8 -
.../IgniteCacheFailoverTestSuite2.java | 47 +++++
.../CacheAbstractQueryMetricsSelfTest.java | 205 ++++++++++++++++++
.../CachePartitionedQueryMetricsSelfTest.java | 32 +++
.../CacheReplicatedQueryMetricsSelfTest.java | 32 +++
.../cache/GridCacheQueryMetricsSelfTest.java | 206 -------------------
.../query/h2/sql/BaseH2CompareQueryTest.java | 2 +-
.../IgniteCacheQuerySelfTestSuite.java | 4 +-
13 files changed, 415 insertions(+), 263 deletions(-)
----------------------------------------------------------------------