Merge branch 'branch-feature-AMBARI-21348' into branch-2.5

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

Branch: refs/heads/branch-2.5
Commit: 621f38019a81c4183b0e001efe00e89c6583d85a
Parents: 88d93b9 cb86bf0
Author: Siddharth Wagle <swa...@hortonworks.com>
Authored: Wed Jul 12 10:11:56 2017 -0700
Committer: Siddharth Wagle <swa...@hortonworks.com>
Committed: Wed Jul 12 10:11:56 2017 -0700

----------------------------------------------------------------------
 .../0.96.0.2.0/package/scripts/hbase_service.py    | 17 +++++++++++++++++
 .../0.96.0.2.0/package/scripts/params_linux.py     |  9 +++++++++
 .../BigInsights/4.2.5/upgrades/config-upgrade.xml  | 11 +++++++++++
 .../upgrades/nonrolling-upgrade-to-hdp-2.6.xml     |  5 +++++
 .../BigInsights/4.2/upgrades/config-upgrade.xml    | 11 +++++++++++
 .../4.2/upgrades/nonrolling-upgrade-to-hdp-2.6.xml |  7 ++++++-
 ambari-web/app/messages.js                         |  2 ++
 ambari-web/app/utils/ajax/ajax.js                  |  2 +-
 .../main/admin/stack_upgrade/versions_view.js      | 14 ++++++++++++++
 .../main/admin/stack_upgrade/version_view_test.js  |  4 ++++
 10 files changed, 80 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/621f3801/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ambari/blob/621f3801/ambari-web/app/utils/ajax/ajax.js
----------------------------------------------------------------------

Reply via email to