Merge remote-tracking branch 'origin/sprint-1' into sprint-1

Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6e536271
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6e536271
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6e536271

Branch: refs/heads/master
Commit: 6e536271f5f24f500ce13f46d6f5bce3bdc1c8de
Parents: 4ffb6db c0e1b52
Author: sboikov <sboi...@gridgain.com>
Authored: Mon Feb 16 13:46:47 2015 +0300
Committer: sboikov <sboi...@gridgain.com>
Committed: Mon Feb 16 13:46:47 2015 +0300

----------------------------------------------------------------------
 .../org/apache/ignite/compute/ComputeTask.java  |  3 +--
 .../apache/ignite/resources/package-info.java   | 22 +++++++++++++++++
 .../org/apache/ignite/resources/package.html    | 25 --------------------
 .../commands/cache/VisorCacheCommand.scala      |  2 +-
 .../commands/top/VisorTopologyCommand.scala     |  3 +--
 .../scala/org/apache/ignite/visor/visor.scala   |  2 +-
 6 files changed, 26 insertions(+), 31 deletions(-)
----------------------------------------------------------------------


Reply via email to