Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d85616b9 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d85616b9 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d85616b9 Branch: refs/heads/master Commit: d85616b9bd788d0192272a13df18f9319f14a836 Parents: f6dcc63 1301646 Author: Yakov Zhdanov <yzhda...@gridgain.com> Authored: Mon Jan 18 17:58:48 2016 +0300 Committer: Yakov Zhdanov <yzhda...@gridgain.com> Committed: Mon Jan 18 17:58:48 2016 +0300 ---------------------------------------------------------------------- .../internal/processors/igfs/IgfsProcessor.java | 3 --- ...CommunicationRecoveryAckClosureSelfTest.java | 2 ++ ...niteCacheP2pUnmarshallingQueryErrorTest.java | 20 +++++--------------- .../Common/IgniteFutureCancelledException.cs | 1 + 4 files changed, 8 insertions(+), 18 deletions(-) ----------------------------------------------------------------------
