You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/07/08 08:20:57 UTC
[8/8] incubator-ignite git commit: Merge remote-tracking branch
'remotes/origin/master' into ignite-747
Merge remote-tracking branch 'remotes/origin/master' into ignite-747
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c15d964a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c15d964a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c15d964a
Branch: refs/heads/ignite-747
Commit: c15d964a5aabdd969f784f3daeeb20346415c465
Parents: ccce9fb 0f1b31a
Author: Denis Magda <dm...@gridgain.com>
Authored: Wed Jul 8 09:19:47 2015 +0300
Committer: Denis Magda <dm...@gridgain.com>
Committed: Wed Jul 8 09:19:47 2015 +0300
----------------------------------------------------------------------
dev-tools/slurp.sh | 2 +-
.../cache/eviction/fifo/FifoEvictionPolicy.java | 5 -
.../cache/eviction/lru/LruEvictionPolicy.java | 5 -
.../eviction/sorted/SortedEvictionPolicy.java | 19 +--
.../internal/interop/InteropIgnition.java | 17 +-
.../internal/interop/InteropProcessor.java | 7 +
.../cache/query/GridCacheQueryAdapter.java | 35 ++++-
.../processors/query/GridQueryProcessor.java | 5 +
...heConcurrentEvictionConsistencySelfTest.java | 15 +-
.../CacheAbstractQueryMetricsSelfTest.java | 157 ++++++++++++++++++-
.../cache/CacheLocalQueryMetricsSelfTest.java | 33 ++++
...titionedQueryMetricsDistributedSelfTest.java | 33 ++++
...chePartitionedQueryMetricsLocalSelfTest.java | 33 ++++
.../CachePartitionedQueryMetricsSelfTest.java | 32 ----
...plicatedQueryMetricsDistributedSelfTest.java | 33 ++++
...acheReplicatedQueryMetricsLocalSelfTest.java | 33 ++++
.../CacheReplicatedQueryMetricsSelfTest.java | 32 ----
.../IgniteCacheQuerySelfTestSuite.java | 7 +-
scripts/git-patch-prop.sh | 2 +-
19 files changed, 404 insertions(+), 101 deletions(-)
----------------------------------------------------------------------