Merge branch 'branch-feature-AMBARI-12556' into trunk
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/851c8571 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/851c8571 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/851c8571 Branch: refs/heads/branch-feature-AMBARI-20859 Commit: 851c85718b8a239392d51c937f51b3c070b27356 Parents: 81f64bf 9a42d40 Author: Jonathan Hurley <jhur...@hortonworks.com> Authored: Thu Jun 1 09:31:13 2017 -0400 Committer: Jonathan Hurley <jhur...@hortonworks.com> Committed: Thu Jun 1 09:31:13 2017 -0400 ---------------------------------------------------------------------- .../AmbariCustomCommandExecutionHelper.java | 10 ++-- .../server/controller/KerberosHelperImpl.java | 10 +++- .../internal/UpgradeResourceProvider.java | 26 +++++++--- .../0.12.0.2.0/package/scripts/params_linux.py | 2 +- .../2.1.0.3.0/package/scripts/params_linux.py | 2 +- .../AmbariManagementControllerTest.java | 6 +-- .../server/controller/KerberosHelperTest.java | 7 +++ .../internal/UpgradeResourceProviderTest.java | 54 ++++++++++++++++++++ .../upgrades/upgrade_execute_task_test.xml | 42 +++++++++++++++ 9 files changed, 139 insertions(+), 20 deletions(-) ----------------------------------------------------------------------