Merge remote-tracking branch 'remotes/origin/ignite-sprint-5' into ignite-373
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a7db9fb5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a7db9fb5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a7db9fb5 Branch: refs/heads/ignite-373 Commit: a7db9fb516e09d044018240b5fee6c5e2e42c75f Parents: 2c1f265 7c91389 Author: ivasilinets <ivasilin...@gridgain.com> Authored: Thu May 14 15:26:43 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Thu May 14 15:26:43 2015 +0300 ---------------------------------------------------------------------- bin/ignite-schema-import.bat | 2 +- bin/ignite-schema-import.sh | 2 +- bin/ignite.bat | 2 +- bin/ignite.sh | 2 +- bin/ignitevisorcmd.bat | 2 +- bin/ignitevisorcmd.sh | 2 +- .../ignite/internal/GridInternalWrapper.java | 30 ---- .../GridDhtPartitionsExchangeFuture.java | 2 +- .../closure/GridClosureProcessor.java | 25 +-- .../internal/processors/igfs/IgfsJobImpl.java | 10 +- .../processors/resource/GridResourceField.java | 5 +- .../processors/resource/GridResourceIoc.java | 50 +++--- .../resource/GridResourceProcessor.java | 22 +-- .../processors/resource/GridResourceUtils.java | 15 -- .../processors/resource/InjectRecursively.java | 30 ++++ .../ignite/internal/util/IgniteUtils.java | 3 + .../util/lang/GridComputeJobWrapper.java | 96 ------------ .../spi/discovery/tcp/TcpDiscoverySpi.java | 2 - .../GridCacheLocalIsolatedNodesSelfTest.java | 18 ++- .../scalar/tests/ScalarCacheQueriesSpec.scala | 154 +++++++++---------- .../ignite/scalar/tests/ScalarCacheSpec.scala | 23 +-- .../scalar/tests/ScalarConversionsSpec.scala | 43 +++--- .../scalar/tests/ScalarProjectionSpec.scala | 128 ++++++++------- .../scalar/tests/ScalarReturnableSpec.scala | 41 ++--- modules/visor-console/pom.xml | 2 +- .../ignite/visor/VisorRuntimeBaseSpec.scala | 2 +- .../visor/commands/VisorArgListSpec.scala | 60 ++++---- .../commands/VisorFileNameCompleterSpec.scala | 34 ++-- .../commands/ack/VisorAckCommandSpec.scala | 20 +-- .../commands/alert/VisorAlertCommandSpec.scala | 68 ++++---- .../cache/VisorCacheClearCommandSpec.scala | 48 +++--- .../commands/cache/VisorCacheCommandSpec.scala | 66 ++++---- .../config/VisorConfigurationCommandSpec.scala | 8 +- .../cswap/VisorCacheSwapCommandSpec.scala | 24 +-- .../deploy/VisorDeployCommandSpec.scala | 10 +- .../disco/VisorDiscoveryCommandSpec.scala | 46 +++--- .../events/VisorEventsCommandSpec.scala | 28 ++-- .../visor/commands/gc/VisorGcCommandSpec.scala | 30 ++-- .../commands/help/VisorHelpCommandSpec.scala | 57 +++---- .../commands/kill/VisorKillCommandSpec.scala | 58 +++---- .../commands/log/VisorLogCommandSpec.scala | 10 +- .../commands/mem/VisorMemoryCommandSpec.scala | 77 +++++----- .../commands/node/VisorNodeCommandSpec.scala | 22 +-- .../commands/open/VisorOpenCommandSpec.scala | 16 +- .../commands/ping/VisorPingCommandSpec.scala | 16 +- .../commands/start/VisorStartCommandSpec.scala | 126 +++++++-------- .../commands/tasks/VisorTasksCommandSpec.scala | 112 +++++++------- .../commands/top/VisorTopologyCommandSpec.scala | 52 +++---- .../commands/vvm/VisorVvmCommandSpec.scala | 30 ++-- 49 files changed, 819 insertions(+), 912 deletions(-) ----------------------------------------------------------------------
