Merge remote-tracking branch 'remotes/origin/ignite-838' into ignite-sprint-4
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1e533950 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1e533950 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1e533950 Branch: refs/heads/ignite-157-2 Commit: 1e533950ffcbb1ec16781ff406a654cfd612e1cc Parents: c8f7d38 dbd8d64 Author: sboikov <semen.boi...@inria.fr> Authored: Wed Apr 29 21:59:51 2015 +0300 Committer: sboikov <semen.boi...@inria.fr> Committed: Wed Apr 29 21:59:51 2015 +0300 ---------------------------------------------------------------------- .../org/apache/ignite/spi/IgniteSpiAdapter.java | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) ----------------------------------------------------------------------
