Merge remote-tracking branch 'remotes/origin/ignite-sprint-5' into ignite-883_1
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/75006b80 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/75006b80 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/75006b80 Branch: refs/heads/ignite-389 Commit: 75006b805a9997354ea9a1c645ad11ab8f9ba631 Parents: e237b00 5f06f57 Author: sboikov <sboi...@gridgain.com> Authored: Fri Jun 5 18:11:06 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Fri Jun 5 18:11:06 2015 +0300 ---------------------------------------------------------------------- .../affinity/GridAffinityProcessor.java | 23 ++++- .../datastreamer/DataStreamerImpl.java | 92 ++++++++++++++------ .../DataStreamerMultiThreadedSelfTest.java | 59 +++++++++---- .../IgniteMessagingWithClientTest.java | 2 + 4 files changed, 131 insertions(+), 45 deletions(-) ----------------------------------------------------------------------