ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jonathanhur...@apache.org
Subject [5/5] ambari git commit: Merge branch 'trunk' into branch-feature-AMBARI-12556
Date Thu, 01 Jun 2017 13:30:55 GMT
Merge branch 'trunk' into branch-feature-AMBARI-12556


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9a42d400
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9a42d400
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9a42d400

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: 9a42d4003934046b74fdf6b5754d1a55b30b2bb3
Parents: 36cc11b 81f64bf
Author: Jonathan Hurley <jhurley@hortonworks.com>
Authored: Thu Jun 1 09:27:25 2017 -0400
Committer: Jonathan Hurley <jhurley@hortonworks.com>
Committed: Thu Jun 1 09:27:25 2017 -0400

----------------------------------------------------------------------
 .../impl/MapFieldNameDescriptorImpl.java        |  2 +-
 .../ambari/logsearch/conf/ApiDocConfig.java     | 35 +++++++++++---
 .../logsearch/rest/AuditLogsResource.java       |  2 +-
 ambari-web/app/styles/alerts.less               |  8 ++--
 ambari-web/app/styles/application.less          |  3 +-
 .../app/styles/theme/bootstrap-ambari.css       | 48 ++++++++++++++------
 .../app/templates/main/side-menu-item.hbs       |  6 +--
 ambari-web/app/templates/wizard/step6.hbs       |  2 +-
 ambari-web/app/views/main/menu.js               | 11 +++++
 .../vendor/scripts/theme/bootstrap-ambari.js    | 20 ++++----
 10 files changed, 96 insertions(+), 41 deletions(-)
----------------------------------------------------------------------



Mime
View raw message