Merge branch 'APEXCORE-488.ssl-issues' of github.com:pradeepdalvi/apex-core into up-master
Project: http://git-wip-us.apache.org/repos/asf/apex-core/repo Commit: http://git-wip-us.apache.org/repos/asf/apex-core/commit/7ca1ed12 Tree: http://git-wip-us.apache.org/repos/asf/apex-core/tree/7ca1ed12 Diff: http://git-wip-us.apache.org/repos/asf/apex-core/diff/7ca1ed12 Branch: refs/heads/master Commit: 7ca1ed12d022e7d99e2dde3dc305b4b39ae46c26 Parents: d32ea3c 4f3ab00 Author: Pramod Immaneni <[email protected]> Authored: Mon Jul 18 22:48:13 2016 -0700 Committer: Pramod Immaneni <[email protected]> Committed: Mon Jul 18 22:48:13 2016 -0700 ---------------------------------------------------------------------- .../stram/StreamingAppMasterService.java | 7 ++++++- .../com/datatorrent/stram/client/StramAgent.java | 9 ++++++++- .../com/datatorrent/stram/util/ConfigUtils.java | 19 +++++++++++++++++-- 3 files changed, 31 insertions(+), 4 deletions(-) ----------------------------------------------------------------------
