Merge branch 'APEX-35' of https://github.com/davidyan74/Apex into davidyan74-APEX-35
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/d934b978 Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/d934b978 Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/d934b978 Branch: refs/heads/master Commit: d934b978c195ba832b5350ad59b6d3ffe7fd810f Parents: c5d819b 45c7685 Author: thomas <[email protected]> Authored: Thu Aug 6 20:43:08 2015 -0700 Committer: thomas <[email protected]> Committed: Thu Aug 6 20:43:08 2015 -0700 ---------------------------------------------------------------------- .../stram/StreamingContainerManager.java | 48 +++++++++----------- 1 file changed, 21 insertions(+), 27 deletions(-) ----------------------------------------------------------------------
