Merge remote-tracking branch 'origin/trunk' into trunk
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d7dd184c Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d7dd184c Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d7dd184c Branch: refs/heads/branch-alerts-dev Commit: d7dd184c36985d58f501d729cc13022e040b7f23 Parents: 4a5d07d a43c081 Author: aBabiichuk <[email protected]> Authored: Fri Sep 26 16:03:24 2014 +0300 Committer: aBabiichuk <[email protected]> Committed: Fri Sep 26 16:03:24 2014 +0300 ---------------------------------------------------------------------- ambari-web/app/views/common/filter_view.js | 20 ++++++++++++++------ ambari-web/app/views/common/table_view.js | 1 + .../views/main/dashboard/config_history_view.js | 1 + ambari-web/app/views/main/dashboard/widgets.js | 6 ++++++ 4 files changed, 22 insertions(+), 6 deletions(-) ----------------------------------------------------------------------
