Merge branches 'ignite-789' and 'ignite-sprint-4' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-789
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a40ae517 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a40ae517 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a40ae517 Branch: refs/heads/ignite-286 Commit: a40ae517b48471d74a855cf86ab2cfc9a1be2125 Parents: cda5bae 7ff09b9 Author: AKuznetsov <akuznet...@gridgain.com> Authored: Tue Apr 28 16:35:31 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Tue Apr 28 16:35:31 2015 +0700 ---------------------------------------------------------------------- .../ignite/internal/GridJobContextImpl.java | 7 +- .../ignite/internal/visor/cache/VisorCache.java | 92 +++++++++++--------- .../visor/node/VisorBasicConfiguration.java | 11 +++ .../visor/node/VisorNodeDataCollectorJob.java | 2 +- .../config/VisorConfigurationCommand.scala | 1 + .../scala/org/apache/ignite/visor/visor.scala | 11 +++ pom.xml | 5 +- 7 files changed, 83 insertions(+), 46 deletions(-) ----------------------------------------------------------------------
