Merge remote-tracking branch 'origin/trunk' into trunk
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b9662cef
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b9662cef
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b9662cef
Branch: refs/heads/trunk
Commit: b9662cef66d5e4a5b53405dab40e9d17eafeb966
Parents: e463d27 67c425a
Author: aBabiichuk
Authored: Tue Apr 21 19:55:14 2015 +0300
Committer: aBabiichuk
Committed: Tue Apr 21 19:55:14 2015 +0300
--
.../ambari-metrics-timelineservice/pom.xml | 1 +
.../timeline/HBaseTimelineMetricStore.java | 40 ++--
.../metrics/timeline/PhoenixHBaseAccessor.java | 144 ++--
.../metrics/timeline/Precision.java | 6 +-
.../timeline/TimelineMetricConfiguration.java | 29 ++-
.../aggregators/AbstractTimelineAggregator.java | 58 -
.../TimelineClusterMetricReader.java| 42
.../aggregators/TimelineMetricAggregator.java | 151 ++--
.../TimelineMetricAggregatorFactory.java| 188 ++-
.../TimelineMetricClusterAggregator.java| 235 ++-
.../TimelineMetricClusterAggregatorHourly.java | 175 --
.../TimelineMetricClusterAggregatorMinute.java | 201
.../TimelineMetricHostAggregator.java | 113 +
.../aggregators/TimelineMetricReadHelper.java | 36 +++
.../timeline/query/PhoenixTransactSQL.java | 82 ---
.../timeline/AbstractMiniHBaseClusterTest.java | 5 +-
.../metrics/timeline/ITClusterAggregator.java | 99 ++--
.../metrics/timeline/ITMetricAggregator.java| 82 ++-
.../timeline/ITPhoenixHBaseAccessor.java| 34 ++-
.../metrics/timeline/MetricTestHelper.java | 7 +-
.../timeline/TestMetricHostAggregate.java | 4 +-
.../0.1.0/configuration/ams-site.xml| 70 +-
.../2.0.6/hooks/before-ANY/scripts/params.py| 2 +
.../before-ANY/scripts/shared_initialization.py | 38 ++-
.../2.3/services/TEZ/configuration/tez-site.xml | 28 +++
.../rangerAdmin/step1_controller.js | 26 +-
.../rangerAdmin/wizard_controller.js| 2 +
ambari-web/app/controllers/wizard.js| 30 ++-
ambari-web/app/messages.js | 7 +
.../app/routes/ra_high_availability_routes.js | 9 +-
.../highAvailability/rangerAdmin/step1.hbs | 21 +-
ambari-web/app/utils/validator.js | 10 +
ambari-web/test/controllers/wizard_test.js | 45
ambari-web/test/utils/validator_test.js | 17 ++
34 files changed, 1280 insertions(+), 757 deletions(-)
--
