Merge branch 'APEXCORE-597' of github.com:vrozov/apex-core
Project: http://git-wip-us.apache.org/repos/asf/apex-core/repo Commit: http://git-wip-us.apache.org/repos/asf/apex-core/commit/c42f26e0 Tree: http://git-wip-us.apache.org/repos/asf/apex-core/tree/c42f26e0 Diff: http://git-wip-us.apache.org/repos/asf/apex-core/diff/c42f26e0 Branch: refs/heads/master Commit: c42f26e01d9e4fc8748217c4605f3e9a57ea9ca2 Parents: b4a4e05 075dd48 Author: Pramod Immaneni <[email protected]> Authored: Mon Mar 27 07:57:35 2017 -0700 Committer: Pramod Immaneni <[email protected]> Committed: Mon Mar 27 07:57:35 2017 -0700 ---------------------------------------------------------------------- .../datatorrent/bufferserver/server/Server.java | 126 +++++++++++++++---- .../bufferserver/client/SubscriberTest.java | 6 +- .../bufferserver/server/ServerTest.java | 6 +- .../bufferserver/storage/DiskStorageTest.java | 6 +- .../datatorrent/stram/StramLocalCluster.java | 6 +- .../stram/engine/StreamingContainer.java | 8 +- .../stram/engine/GenericNodeTest.java | 6 +- .../stram/stream/FastStreamTest.java | 6 +- .../stram/stream/SocketStreamTest.java | 6 +- 9 files changed, 126 insertions(+), 50 deletions(-) ----------------------------------------------------------------------
