Merge remote-tracking branch 'remotes/apache-main/master' into ignite-1301
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/88f79990 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/88f79990 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/88f79990 Branch: refs/heads/ignite-1301 Commit: 88f799904ef17e92eb364752ba64b02efc56d075 Parents: 6c5e833 c279fca Author: Denis Magda <dma...@gridgain.com> Authored: Thu Aug 27 14:01:20 2015 +0300 Committer: Denis Magda <dma...@gridgain.com> Committed: Thu Aug 27 14:01:20 2015 +0300 ---------------------------------------------------------------------- .../org/apache/ignite/internal/portable/PortableContext.java | 7 +++++-- .../cache/distributed/dht/GridDhtTxPrepareFuture.java | 6 +++++- 2 files changed, 10 insertions(+), 3 deletions(-) ----------------------------------------------------------------------
