Merge branches 'ignite-1121' and 'ignite-961' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-1121
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a13453f5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a13453f5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a13453f5 Branch: refs/heads/ignite-843 Commit: a13453f5d2d6b35f3b276f8cfb89ea6cda561834 Parents: e24f3b7 6961060 Author: Andrey <anovi...@gridgain.com> Authored: Fri Jul 31 09:46:17 2015 +0700 Committer: Andrey <anovi...@gridgain.com> Committed: Fri Jul 31 09:46:17 2015 +0700 ---------------------------------------------------------------------- .../datastreamer/DataStreamerImpl.java | 22 ++++++++++++++++++++ .../datastreamer/DataStreamerUpdateJob.java | 20 +++++++++++++++++- 2 files changed, 41 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
