Merge branch 'trunk' into branch-feature-AMBARI-20053
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6553ffae Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6553ffae Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6553ffae Branch: refs/heads/trunk Commit: 6553ffaee57a0c2a3ccc2389cfe4ecffef791338 Parents: 0c464b7 59daf8b Author: Jonathan Hurley <[email protected]> Authored: Tue Feb 21 17:35:37 2017 -0500 Committer: Jonathan Hurley <[email protected]> Committed: Tue Feb 21 17:35:37 2017 -0500 ---------------------------------------------------------------------- .../timeline/AbstractTimelineMetricsSink.java | 22 +- .../timeline/HadoopTimelineMetricsSink.java | 11 +- .../kerberos/FinalizeKerberosServerAction.java | 14 +- .../kerberos/KerberosServerAction.java | 2 +- .../DRUID/0.9.2/package/scripts/params.py | 2 +- .../DRUID/0.9.2/package/scripts/superset.py | 2 +- .../common-services/YARN/2.1.0.2.0/metainfo.xml | 1 + .../common-services/YARN/3.0.0.3.0/metainfo.xml | 1 + .../FinalizeKerberosServerActionTest.java | 207 +++++++++++++++++++ 9 files changed, 243 insertions(+), 19 deletions(-) ----------------------------------------------------------------------
