Revert wrong merge.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1ef150eb Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1ef150eb Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1ef150eb Branch: refs/heads/master Commit: 1ef150eba52eb63c2bfc3fafa0d036cf26be1c5b Parents: fbbcaf4 Author: Alexey Kuznetsov <[email protected]> Authored: Tue Aug 30 18:18:20 2016 +0700 Committer: Alexey Kuznetsov <[email protected]> Committed: Tue Aug 30 18:18:20 2016 +0700 ---------------------------------------------------------------------- .../ignite/visor/commands/cache/VisorCacheStopCommand.scala | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/1ef150eb/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheStopCommand.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheStopCommand.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheStopCommand.scala index 1b55505..22fb89d 100644 --- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheStopCommand.scala +++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheStopCommand.scala @@ -19,7 +19,6 @@ package org.apache.ignite.visor.commands.cache import org.apache.ignite.cluster.{ClusterGroupEmptyException, ClusterNode} import org.apache.ignite.visor.visor._ - import org.apache.ignite.internal.visor.cache.VisorCacheStopTask import org.apache.ignite.internal.visor.util.VisorTaskUtils._ @@ -102,7 +101,9 @@ class VisorCacheStopCommand { return } - ask(s"Are you sure you want to stop cache: ${escapeName(cacheName)}? (y/n) [n]: ", "n") match { + val dflt = if (batchMode) "y" else "n" + + ask(s"Are you sure you want to stop cache: ${escapeName(cacheName)}? (y/n) [$dflt]: ", dflt) match { case "y" | "Y" => try { executeRandom(grp, classOf[VisorCacheStopTask], cacheName)
