Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1758-debug
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ca7eebde Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ca7eebde Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ca7eebde Branch: refs/heads/ignite-1758-debug Commit: ca7eebde9608fe59c8ed443dd452a4b509e6afb0 Parents: a469316 c9cea76 Author: sboikov <[email protected]> Authored: Fri Nov 13 14:24:00 2015 +0300 Committer: sboikov <[email protected]> Committed: Fri Nov 13 14:24:00 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(-) ----------------------------------------------------------------------
