You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/07/08 15:18:57 UTC
[43/50] incubator-ignite git commit: Merge remote-tracking branch
'origin/ignite-648' into ignite-648
Merge remote-tracking branch 'origin/ignite-648' into ignite-648
Conflicts:
modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteProcessProxy.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/80ea1a3d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/80ea1a3d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/80ea1a3d
Branch: refs/heads/ignite-648-failover
Commit: 80ea1a3d8bbe1e7a61d90e962ab301d4a387d7c2
Parents: 00a9858 cf6d99d
Author: ashutak <as...@gridgain.com>
Authored: Wed Jul 8 14:32:21 2015 +0300
Committer: ashutak <as...@gridgain.com>
Committed: Wed Jul 8 14:32:21 2015 +0300
----------------------------------------------------------------------
.../cache/affinity/fair/FairAffinityFunction.java | 3 ++-
.../ignite/internal/interop/InteropIgnition.java | 17 ++++++++++++++++-
.../ignite/internal/interop/InteropProcessor.java | 7 +++++++
.../junits/multijvm/IgniteProcessProxy.java | 4 ++--
4 files changed, 27 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80ea1a3d/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteProcessProxy.java
----------------------------------------------------------------------