# merge from master
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5f28cce3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5f28cce3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5f28cce3 Branch: refs/heads/ignite-901 Commit: 5f28cce34c6d0329e0a2ea46d6ea8b4aaf23eb0a Parents: b19f5c4 6386794 Author: sboikov <sboi...@gridgain.com> Authored: Fri Jul 10 15:56:18 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Fri Jul 10 15:56:18 2015 +0300 ---------------------------------------------------------------------- .../internal/processors/datastreamer/DataStreamProcessor.java | 3 +++ .../java/org/apache/ignite/testsuites/IgniteHadoopTestSuite.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
