Merge remote-tracking branch 'remotes/origin/ignite-1.5'
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3a8c19ed Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3a8c19ed Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3a8c19ed Branch: refs/heads/ignite-direct-marsh-opt Commit: 3a8c19ed14d92bfda161ddf2d5a783ad34ace665 Parents: af4e948 c9cea76 Author: Anton Vinogradov <a...@apache.org> Authored: Fri Nov 13 14:21:52 2015 +0300 Committer: Anton Vinogradov <a...@apache.org> Committed: Fri Nov 13 14:21:52 2015 +0300 ---------------------------------------------------------------------- .../cache/distributed/dht/preloader/GridDhtPartitionSupplier.java | 3 +++ .../src/main/scala/org/apache/ignite/visor/visor.scala | 3 +-- 2 files changed, 4 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
