Merge branch 'APEX-274' of https://github.com/ishark/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/c30dd952 Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/c30dd952 Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/c30dd952 Branch: refs/heads/devel-3 Commit: c30dd952c5d99102c6626bcc1aec96febdc4aeb5 Parents: 9656248 d29ce95 Author: Thomas Weise <[email protected]> Authored: Mon Nov 23 16:00:34 2015 -0800 Committer: Thomas Weise <[email protected]> Committed: Mon Nov 23 16:00:34 2015 -0800 ---------------------------------------------------------------------- .../stram/StreamingContainerManager.java | 2 +- .../stram/plan/physical/PhysicalPlan.java | 13 +++++--- .../stram/StreamingContainerManagerTest.java | 34 +++++++++++++++++++- 3 files changed, 43 insertions(+), 6 deletions(-) ----------------------------------------------------------------------
