Merge branches 'ignite-1.5' and 'master' of https://git-wip-us.apache.org/repos/asf/ignite
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/84c88e0d Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/84c88e0d Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/84c88e0d Branch: refs/heads/ignite-direct-marsh-opt Commit: 84c88e0d80ce2dcbd614ad5565e677d732f519a3 Parents: 9f7286e 92881e0 Author: Alexey Kuznetsov <akuznet...@apache.org> Authored: Wed Nov 11 14:32:42 2015 +0700 Committer: Alexey Kuznetsov <akuznet...@apache.org> Committed: Wed Nov 11 14:32:42 2015 +0700 ---------------------------------------------------------------------- ...gniteCachePutRetryTransactionalSelfTest.java | 10 +++++++++ .../org/apache/ignite/yardstick/IgniteNode.java | 23 ++++++++++++++------ 2 files changed, 26 insertions(+), 7 deletions(-) ----------------------------------------------------------------------
