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 2017/10/11 15:06:38 UTC
[2/2] ignite git commit: Merge remote-tracking branch
'origin/ignite-5932' into ignite-5932
Merge remote-tracking branch 'origin/ignite-5932' into ignite-5932
# Conflicts:
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/17800622
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/17800622
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/17800622
Branch: refs/heads/ignite-5932
Commit: 1780062262d3305ddd5ad0851867f900290372ba
Parents: 64df9db 5318153
Author: sboikov <sb...@gridgain.com>
Authored: Wed Oct 11 18:06:11 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Wed Oct 11 18:06:11 2017 +0300
----------------------------------------------------------------------
----------------------------------------------------------------------