Merge branch 'devel-3' of https://git-wip-us.apache.org/repos/asf/incubator-apex-core into devel-3
Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/commit/2e8ffc6b Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/2e8ffc6b Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/2e8ffc6b Branch: refs/heads/feature-module Commit: 2e8ffc6be9905dc2165965445a2122caa9b49776 Parents: eb0a95f 83f95d8 Author: Ilya Ganelin <[email protected]> Authored: Wed Oct 21 22:07:47 2015 -0700 Committer: Ilya Ganelin <[email protected]> Committed: Wed Oct 21 22:07:47 2015 -0700 ---------------------------------------------------------------------- .../com/datatorrent/stram/StreamingContainerManager.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) ----------------------------------------------------------------------
