Merge remote-tracking branch 'origin/trunk' into origin-trunk
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1cd81bec Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1cd81bec Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1cd81bec Branch: refs/heads/trunk Commit: 1cd81bec552f57dda605468393e71b40c8c40475 Parents: 9e2a81d 90cca9b Author: Oleg Nechiporenko <onechipore...@apache.org> Authored: Fri Sep 26 17:14:55 2014 +0300 Committer: Oleg Nechiporenko <onechipore...@apache.org> Committed: Fri Sep 26 17:14:55 2014 +0300 ---------------------------------------------------------------------- .../HDP/2.0.6/services/HIVE/configuration/hive-site.xml | 8 +++++++- ambari-web/app/controllers/main/host/details.js | 4 ++++ ambari-web/app/data/HDP2/site_properties.js | 12 +++++++++++- ambari-web/app/messages.js | 4 ++-- ambari-web/app/models/service_config.js | 1 + 5 files changed, 25 insertions(+), 4 deletions(-) ----------------------------------------------------------------------
