Merge branch 'APEX-92' 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/0a85586d Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/0a85586d Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/0a85586d Branch: refs/heads/master Commit: 0a85586dfd194a0b77cb438e68a54c16e99d2cf7 Parents: e6263b5 d8e1e74 Author: Vlad Rozov <[email protected]> Authored: Fri Sep 25 18:08:10 2015 -0700 Committer: Vlad Rozov <[email protected]> Committed: Fri Sep 25 18:08:10 2015 -0700 ---------------------------------------------------------------------- engine/pom.xml | 2 +- .../stram/StreamingAppMasterService.java | 83 ++++++++++++++------ 2 files changed, 62 insertions(+), 23 deletions(-) ----------------------------------------------------------------------
