Merge branches 'ignite-690' and 'ignite-737' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-737
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3441ac71 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3441ac71 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3441ac71 Branch: refs/heads/ignite-sprint-4 Commit: 3441ac710322a3fbbe2830c5cafb60d133806755 Parents: 7c6fb23 e8a9dfb Author: AKuznetsov <akuznet...@gridgain.com> Authored: Thu Apr 16 14:27:31 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Thu Apr 16 14:27:31 2015 +0700 ---------------------------------------------------------------------- DEVNOTES.txt | 49 +++++++++++++++++ .../dht/atomic/GridDhtAtomicCache.java | 2 +- .../visor/commands/ack/VisorAckCommand.scala | 7 +-- .../commands/cache/VisorCacheClearCommand.scala | 18 ++---- .../commands/cache/VisorCacheCommand.scala | 6 +- .../commands/cache/VisorCacheScanCommand.scala | 29 ++-------- .../commands/cache/VisorCacheStopCommand.scala | 22 +------- .../commands/cache/VisorCacheSwapCommand.scala | 15 ++--- .../commands/disco/VisorDiscoveryCommand.scala | 12 ++-- .../commands/events/VisorEventsCommand.scala | 4 +- .../visor/commands/gc/VisorGcCommand.scala | 21 +++---- .../commands/tasks/VisorTasksCommand.scala | 28 ++++------ .../scala/org/apache/ignite/visor/visor.scala | 58 +++++++++++++------- 13 files changed, 135 insertions(+), 136 deletions(-) ----------------------------------------------------------------------
