Merge branch 'trunk' into branch-feature-AMBARI-20859
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/698465d5 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/698465d5 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/698465d5 Branch: refs/heads/branch-feature-AMBARI-20859 Commit: 698465d5af12f2c4586d8ece3b92947f2dbf34e6 Parents: d6b271e edd5ce9 Author: Robert Levas <[email protected]> Authored: Fri Oct 20 10:06:31 2017 -0400 Committer: Robert Levas <[email protected]> Committed: Fri Oct 20 10:06:31 2017 -0400 ---------------------------------------------------------------------- .../DRUID/0.10.1/themes/theme.json | 26 ++++++++++---------- .../SUPERSET/0.15.0/themes/theme.json | 22 ++++++++--------- .../src/test/python/TestAmbariServer.py | 4 --- 3 files changed, 24 insertions(+), 28 deletions(-) ----------------------------------------------------------------------
