You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by nc...@apache.org on 2016/02/24 16:07:50 UTC
[03/50] [abbrv] ambari git commit: Merge branch 'trunk' into
branch-dev-patch-upgrade
Merge branch 'trunk' into branch-dev-patch-upgrade
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f31a06da
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f31a06da
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f31a06da
Branch: refs/heads/trunk
Commit: f31a06dafc5b6a6a3f0162de5c9b0d09c5e489aa
Parents: 4b36397 a7a9796
Author: Nate Cole <nc...@hortonworks.com>
Authored: Wed Jan 20 12:03:51 2016 -0500
Committer: Nate Cole <nc...@hortonworks.com>
Committed: Wed Jan 20 12:03:51 2016 -0500
----------------------------------------------------------------------
.../libraries/functions/copy_tarball.py | 5 +-
.../metrics/timeline/AMSPropertyProvider.java | 57 +++--
.../cache/TimelineAppMetricCacheKey.java | 36 +--
.../cache/TimelineMetricsCacheSizeOfEngine.java | 4 +-
.../package/scripts/job_history_server.py | 8 +-
.../SPARK/1.2.0.2.2/package/scripts/params.py | 12 +
.../1.2.0.2.2/package/scripts/setup_spark.py | 18 +-
.../1.2.0.2.2/package/scripts/spark_client.py | 4 +-
.../1.2.0.2.2/package/scripts/spark_service.py | 22 +-
.../package/scripts/spark_thrift_server.py | 8 +-
.../HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml | 6 +
.../stacks/HDP/2.3/upgrades/upgrade-2.4.xml | 6 +
.../SPARK/configuration/spark-defaults.xml | 53 +++++
.../spark-thrift-fairscheduler.xml | 37 ++++
.../configuration/spark-thrift-sparkconf.xml | 164 ++++++++++++++
.../stacks/HDP/2.4/services/SPARK/metainfo.xml | 13 ++
.../stacks/HDP/2.4/upgrades/config-upgrade.xml | 43 ++++
ambari-web/app/controllers/main/host/details.js | 219 ++++++++++---------
ambari-web/app/messages.js | 4 +-
.../configs/add_component_config_initializer.js | 3 +-
.../views/common/configs/config_history_flow.js | 6 +-
.../test/controllers/main/host/details_test.js | 60 ++++-
.../hive/client/HiveInvalidQueryException.java | 27 +++
.../apache/ambari/view/hive/client/Utils.java | 9 +
.../hive/utils/ServiceFormattedException.java | 8 +-
.../ambari/view/hive/client/UtilsTest.java | 43 ++++
docs/pom.xml | 48 +++-
27 files changed, 753 insertions(+), 170 deletions(-)
----------------------------------------------------------------------