Merge remote-tracking branch 'remotes/origin/ignite-sprint-5' into ignite-883_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/db576526 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/db576526 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/db576526 Branch: refs/heads/ignite-389 Commit: db576526600b965d14fe271ac4624401a5b4c239 Parents: a676152 ead66e7 Author: sboikov <sboi...@gridgain.com> Authored: Fri Jun 5 10:02:10 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Fri Jun 5 10:02:10 2015 +0300 ---------------------------------------------------------------------- .../ignite/internal/visor/cache/VisorCache.java | 2 +- .../VisorCacheConfigurationCollectorJob.java | 6 +++--- .../internal/visor/cache/VisorCacheMetrics.java | 19 +++++++++++-------- .../cache/VisorCacheMetricsCollectorTask.java | 10 ++++++---- .../cache/VisorCacheStoreConfiguration.java | 5 ++--- 5 files changed, 23 insertions(+), 19 deletions(-) ----------------------------------------------------------------------
