Merge remote-tracking branch 'origin/branch-1.7.0' into branch-1.7.0
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/bf9fb919 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/bf9fb919 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/bf9fb919 Branch: refs/heads/branch-1.7.0 Commit: bf9fb9192c8f5583889e7d908902b07a547021f8 Parents: c93e0b9 662df7f Author: Oleg Nechiporenko <onechipore...@apache.org> Authored: Mon Oct 6 18:06:28 2014 +0300 Committer: Oleg Nechiporenko <onechipore...@apache.org> Committed: Mon Oct 6 18:06:28 2014 +0300 ---------------------------------------------------------------------- ambari-web/app/templates/main/service/services/storm.hbs | 2 +- ambari-web/app/views/main/service/services/storm.js | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
