Merge remote-tracking branch 'remotes/origin/master' into ignite-1
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/982d441a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/982d441a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/982d441a Branch: refs/heads/ignite-1 Commit: 982d441ab7acb2b00e58b4a91ce5354300b6e855 Parents: 4ea5736 3f25425 Author: sboikov <sboi...@gridgain.com> Authored: Tue Dec 23 11:23:33 2014 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Tue Dec 23 11:23:33 2014 +0300 ---------------------------------------------------------------------- .../preloader/GridDhtPartitionDemandPool.java | 5 ++- .../preloader/GridDhtPartitionSupplyPool.java | 5 ++- .../cache/query/GridCacheQueryAdapter.java | 46 ++++++++++++++++---- .../kernal/visor/cache/VisorCacheMetrics.java | 13 +++--- .../java/org/gridgain/grid/util/GridUtils.java | 19 ++++++++ .../cache/GridCacheAbstractQuerySelfTest.java | 2 +- .../GridCacheReplicatedQuerySelfTest.java | 38 ++++++++++++++++ 7 files changed, 110 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/982d441a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractQuerySelfTest.java ----------------------------------------------------------------------
