Merge branch 'APEXCORE-296' of https://github.com/gauravgopi123/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/c284c39c Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/c284c39c Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/c284c39c Branch: refs/heads/devel-3 Commit: c284c39cd7dd6ff3aba04290f9d4612a1108dbbe Parents: ff198ae d82d766 Author: Thomas Weise <[email protected]> Authored: Fri Jan 15 12:41:56 2016 -0800 Committer: Thomas Weise <[email protected]> Committed: Fri Jan 15 12:41:56 2016 -0800 ---------------------------------------------------------------------- .../datatorrent/stram/StreamingContainerManager.java | 13 +++++++++---- .../stram/plan/physical/OperatorStatus.java | 2 +- 2 files changed, 10 insertions(+), 5 deletions(-) ----------------------------------------------------------------------
