Merge branches 'ignite-185' and 'sprint-2' of http://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-185
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d7353974 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d7353974 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d7353974 Branch: refs/heads/ignite-185 Commit: d7353974e4be847087ed84f86d1c7ea8ea23e087 Parents: 38be2cf c4030f9 Author: anovikov <anovi...@gridgain.com> Authored: Wed Mar 4 10:10:44 2015 +0700 Committer: anovikov <anovi...@gridgain.com> Committed: Wed Mar 4 10:10:44 2015 +0700 ---------------------------------------------------------------------- .../spi/checkpoint/s3/S3CheckpointSpi.java | 2 +- modules/clients/readme.md | 4 +- modules/clients/readme.pdf | Bin 52230 -> 47887 bytes .../integration/ClientAbstractSelfTest.java | 3 - .../apache/ignite/cache/store/CacheStore.java | 49 - .../cache/store/jdbc/CacheJdbcBlobStore.java | 2 +- .../apache/ignite/internal/GridDiagnostic.java | 15 +- .../ignite/internal/GridUpdateNotifier.java | 8 +- .../apache/ignite/internal/IgniteKernal.java | 23 +- .../apache/ignite/marshaller/Marshaller.java | 2 +- .../ignite/marshaller/jdk/JdkMarshaller.java | 2 +- .../optimized/OptimizedMarshaller.java | 2 +- .../SpringApplicationContextResource.java | 2 +- .../checkpoint/cache/CacheCheckpointSpi.java | 2 +- .../spi/checkpoint/jdbc/JdbcCheckpointSpi.java | 2 +- .../sharedfs/SharedFsCheckpointSpi.java | 2 +- .../jobstealing/JobStealingCollisionSpi.java | 4 +- .../PriorityQueueCollisionSpi.java | 2 +- .../communication/tcp/TcpCommunicationSpi.java | 16 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 2 +- .../memory/MemoryEventStorageSpi.java | 2 +- .../spi/failover/always/AlwaysFailoverSpi.java | 2 +- .../jobstealing/JobStealingFailoverSpi.java | 2 +- .../spi/failover/never/NeverFailoverSpi.java | 2 +- .../apache/ignite/spi/indexing/IndexingSpi.java | 2 +- .../adaptive/AdaptiveLoadBalancingSpi.java | 2 +- .../roundrobin/RoundRobinLoadBalancingSpi.java | 2 +- .../WeightedRandomLoadBalancingSpi.java | 2 +- .../spi/swapspace/file/FileSwapSpaceSpi.java | 2 +- .../startup/cmdline/CommandLineStartup.java | 4 +- .../startup/cmdline/ggcube_node_128x128.png | Bin 4679 -> 0 bytes .../startup/cmdline/ggcube_node_48x48.png | Bin 2355 -> 0 bytes .../startup/cmdline/logo_ignite_128x128.png | Bin 0 -> 18667 bytes .../startup/cmdline/logo_ignite_48x48.png | Bin 0 -> 16572 bytes .../internal/GridUpdateNotifierSelfTest.java | 2 +- .../core/src/test/resources/log/ignite.log.tst | 13706 ----------------- .../hibernate/CacheHibernateBlobStore.java | 2 +- .../rest/protocols/http/jetty/rest.html | 19 +- .../spi/deployment/uri/UriDeploymentSpi.java | 2 +- .../ignite/visor/commands/VisorConsole.scala | 16 +- .../ignite/visor/commands/ggcube_128x128.png | Bin 11444 -> 0 bytes .../ignite/visor/commands/ggcube_48x48.png | Bin 3365 -> 0 bytes .../visor/commands/logo_ignite_128x128.png | Bin 0 -> 18667 bytes .../ignite/visor/commands/logo_ignite_48x48.png | Bin 0 -> 16572 bytes pom.xml | 1 - 45 files changed, 57 insertions(+), 13857 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d7353974/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/VisorConsole.scala ---------------------------------------------------------------------- diff --cc modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/VisorConsole.scala index 15900ba,164b307..66cbe3e --- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/VisorConsole.scala +++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/VisorConsole.scala @@@ -17,16 -17,16 +17,16 @@@ package org.apache.ignite.visor.commands - import org.apache.ignite.internal.IgniteVersionUtils._ - import org.apache.ignite.internal.util.scala.impl - import org.apache.ignite.internal.util.{IgniteUtils => U} - import org.apache.ignite.startup.cmdline.AboutDialog - - import javax.swing.ImageIcon import java.awt.Image -import java.io.File +import java.io._ import java.text.SimpleDateFormat import java.util + import javax.swing.ImageIcon + + import org.apache.ignite.internal.IgniteVersionUtils._ + import org.apache.ignite.internal.util.scala.impl + import org.apache.ignite.internal.util.{IgniteUtils => U} + import org.apache.ignite.startup.cmdline.AboutDialog // Built-in commands. // Note the importing of implicit conversions.
