Merge branch 'trunk' of https://git-wip-us.apache.org/repos/asf/ambari into test
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/28c249e5 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/28c249e5 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/28c249e5 Branch: refs/heads/trunk Commit: 28c249e5332515a8f98fe18de872380fc1f30faa Parents: e7089d4 b424b21 Author: Subin <[email protected]> Authored: Fri May 16 00:48:27 2014 +0530 Committer: Subin <[email protected]> Committed: Fri May 16 00:48:27 2014 +0530 ---------------------------------------------------------------------- .../stacks/HDP/2.0.6/services/HIVE/package/scripts/params.py | 3 +-- .../apache/ambari/server/upgrade/UpgradeCatalog160Test.java | 4 +--- .../src/test/python/stacks/2.1/HIVE/test_hive_metastore.py | 8 ++++---- .../src/test/python/stacks/2.1/configs/default.json | 2 +- .../src/test/python/stacks/2.1/configs/secured.json | 2 +- ambari-web/app/controllers/wizard/step8_controller.js | 2 +- 6 files changed, 9 insertions(+), 12 deletions(-) ----------------------------------------------------------------------
