Merge remote-tracking branch 'remotes/origin/master' into ignite-929
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/98e34aca Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/98e34aca Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/98e34aca Branch: refs/heads/ignite-929 Commit: 98e34aca35e62b9007cbb147e9aa25a60d0db570 Parents: 98f4c60 90580d8 Author: sboikov <sboi...@gridgain.com> Authored: Fri Jul 10 08:53:27 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Fri Jul 10 08:53:27 2015 +0300 ---------------------------------------------------------------------- .../internal/processors/datastreamer/DataStreamProcessor.java | 3 +++ .../java/org/apache/ignite/testsuites/IgniteHadoopTestSuite.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
