Merge branch 'APEXCORE-294' of https://github.com/tushargosavi/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/f04e07c0 Tree: http://git-wip-us.apache.org/repos/asf/apex-core/tree/f04e07c0 Diff: http://git-wip-us.apache.org/repos/asf/apex-core/diff/f04e07c0 Branch: refs/heads/master Commit: f04e07c033b4794c0d6fd482982f89fe528b0e30 Parents: 527c70b 51076c6 Author: Thomas Weise <[email protected]> Authored: Fri Feb 3 07:36:32 2017 -0800 Committer: Thomas Weise <[email protected]> Committed: Fri Feb 3 07:36:32 2017 -0800 ---------------------------------------------------------------------- docs/apex_cli.md | 10 +++++++ .../datatorrent/stram/StramLocalCluster.java | 4 +-- .../stram/StreamingContainerAgent.java | 13 ++++++++- .../stram/StreamingContainerManager.java | 25 ++++++++--------- .../StreamingContainerUmbilicalProtocol.java | 20 +++++++++++++- .../java/com/datatorrent/stram/engine/Node.java | 20 +++++++++++--- .../stram/engine/StreamingContainer.java | 28 ++++++++++++++++---- .../stram/webapp/StramWebServices.java | 3 ++- 8 files changed, 98 insertions(+), 25 deletions(-) ----------------------------------------------------------------------
