Merge branch 'branch-2.5' into branch-2.6
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7efb9de2 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7efb9de2 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7efb9de2 Branch: refs/heads/branch-feature-AMBARI-21450 Commit: 7efb9de2bdc85d1d5cef422ea3186bc31798f1e6 Parents: 328735d b9e16b9 Author: Jonathan Hurley <[email protected]> Authored: Fri Aug 4 09:10:45 2017 -0400 Committer: Jonathan Hurley <[email protected]> Committed: Fri Aug 4 09:10:45 2017 -0400 ---------------------------------------------------------------------- .../libraries/functions/version.py | 6 + .../ambari-metrics/datasource.js | 35 +- .../checks/DatabaseConsistencyCheckHelper.java | 115 +++++++ .../controller/utilities/DatabaseChecker.java | 305 ----------------- .../state/configgroup/ConfigGroupImpl.java | 6 +- .../HDF/grafana-nifi-hosts.json | 17 +- .../src/main/resources/scripts/stack_advisor.py | 7 + .../DatabaseConsistencyCheckHelperTest.java | 77 +++++ .../utilities/DatabaseCheckerTest.java | 105 ------ .../app/controllers/wizard/step1_controller.js | 2 + ambari-web/app/routes/installer.js | 4 +- ambari-web/app/templates/wizard/step1.hbs | 342 ++++++++++--------- ambari-web/app/views/wizard/step1_view.js | 2 +- .../test/controllers/wizard/step1_test.js | 2 + ambari-web/test/views/wizard/step1_view_test.js | 2 +- 15 files changed, 437 insertions(+), 590 deletions(-) ----------------------------------------------------------------------
