Merge remote-tracking branch 'origin/branch-2.1' into branch-2.1
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/edc9f488 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/edc9f488 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/edc9f488 Branch: refs/heads/branch-2.1 Commit: edc9f488830d9307df3f2df5e10be43258fedc25 Parents: c2dfb9b 5222188 Author: aBabiichuk <[email protected]> Authored: Mon Jun 22 18:56:14 2015 +0300 Committer: aBabiichuk <[email protected]> Committed: Mon Jun 22 18:56:14 2015 +0300 ---------------------------------------------------------------------- contrib/views/hive/pom.xml | 7 +- .../ui/hive-web/app/controllers/index.js | 4 +- .../ui/hive-web/app/controllers/open-queries.js | 1 - .../hive-web/app/controllers/visual-explain.js | 6 -- contrib/views/utils/pom.xml | 7 +- .../apache/ambari/view/utils/hdfs/HdfsApi.java | 82 +++++++++++++++----- 6 files changed, 77 insertions(+), 30 deletions(-) ----------------------------------------------------------------------
