Merge branches 'ignite-648' and 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-648
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/eabe14ea Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/eabe14ea Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/eabe14ea Branch: refs/heads/ignite-648-failover Commit: eabe14ea70ecd171b1a3e557d89d1697fb113557 Parents: 83f4895 6ed5c1c Author: Yakov Zhdanov <yzhda...@gridgain.com> Authored: Tue Jul 7 18:43:01 2015 +0300 Committer: Yakov Zhdanov <yzhda...@gridgain.com> Committed: Tue Jul 7 18:43:01 2015 +0300 ---------------------------------------------------------------------- .../ignite/internal/interop/InteropIgnition.java | 17 ++++++++++++++++- .../ignite/internal/interop/InteropProcessor.java | 7 +++++++ 2 files changed, 23 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
