You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jo...@apache.org on 2018/01/19 19:59:41 UTC

[ambari] branch branch-feature-AMBARI-14714-ui updated (50e28df -> 2685a0e)

This is an automated email from the ASF dual-hosted git repository.

jonathanhurley pushed a change to branch branch-feature-AMBARI-14714-ui
in repository https://gitbox.apache.org/repos/asf/ambari.git.


    from 50e28df  AMBARI-22695 - Implement download configuration options and custom (i.e. local) repo support (Jason Golieb via jonathanhurley)
     add 7e885a3  AMBARI-22162. Move out the druid configurations from hive-site to hive-interactive-site. (Slim Bouguerra via Swapan Shridhar).
     add 33d67f3  AMBARI-22199.Zeppelin start fails due to permission denied error during kinit(Venkata Sairam)
     add aeb1865  AMBARI-22174. Remove unnecessary Kerberos related properties from BlueprintConfigurationProcessor (magyari_sandor)
     add 8ec33db  AMBARI-22203. ZKFC start failed due to hadoop-hdfs-zkfc is not supported (aonishuk)
     add c19f363  AMBARI-22194 - Prevent Patch Upgrades With Known Service Incompatibilities (jonathanhurley)
     add 08bdd80  AMBARI-22194 - Prevent Patch Upgrades With Known Service Incompatibilities (part2) (jonathanhurley)
     add 7341567  AMBARI-22206. Downgrade UI shown Null when on Patch revert (alexantonenko)
     add 4a47e79  AMBARI-22188. Make hive server create directories related to replication (echekanskiy)
     add 6f59806  AMBARI-22208 Log Search UI: small fixes for top part of Service Logs page. (Istvan Tobias via ababiichuk)
     add 323974e  AMBARI-22205 - Install Version Fails On IOP Cluster Due To Missing stack_packages Structure  (jonathanhurley)
     add c100197  AMBARI-22211. RU was not started on Oracle due to missing table (ncole)
     add 85fb356  AMBARI-22191. Account for merge buffers while calculating druid processing buffer size. (nishantmonu51)
     add 5de82da  AMBARI-22202 : Hive View 2.0 in Ambari 2.5.1 does not use the specified YARN queue when using the "Upload Table" feature. (nitirajrathore)
     add 3acfa5c  AMBARI-22204 Updating Ranger Admin pre-upgrade task (mugdha)
     add c3f6ba7  AMBARI-22147 Move stacks/HDP/3.0/kerberos.json to stacks/kerberos.json (dsen)
     add a8caac3  AMBARI-22131 Move resources/stacks/HDP/3.0/widgets.json to resources/widgets.json (additional patch) (dsen)
     add b86f53f  AMBARI-22213. "ambari-server upgrade" failed on db schema [Upgrade] (dlysnichenko)
     add 3c3b1b8  AMBARI-22214.Livy protocol to be set to https in Zeppelin's interpreter setting(Venkata Sairam)
     add be605cb  AMBARI-22212.Alter logic for storing interpreter.json(Prabhjyot Singh via Venkata Sairam)
     add 68df85d  AMBARI-22207. [Intermittent] While moving master, a manual commands wizard came in between (alexantonenko)
     add 527e45d  AMBARI-22218 Log Search UI generated by maven build uses mock data instead of real API. (ababiichuk)
     add d88d3cc  AMBARI-22221. Fix initialization of Druid Script object. (nishantmonu51)
     add 0f76c7f  AMBARI-22224. host and hostname built-in variables are not populated when performing Kerberos-related operations (rlevas)
     add a8ba5e6  AMBARI-22229.Handle upload of interpreter.json to remote storage in Ambari(Prabhjyot Singh via Venkata Sairam)
     add 8f53bc4  AMBARI-22230 Hosts and Alerts tables UI tweaks. (atkach)
     add 3a0d168  AMBARI-22231 Stopping and starting HDFS component in Ambari will result in Namenode to stay in SAFEMODE (dsen)
     add 20faae7  AMBARI-22226. RU: Downgrade is failed ZKFC (ncole)
     add c8c1812  AMBARI-22235. Druid service check failed during EU. (b-slim via nishantmonu51)
     add 6e1cac8  AMBARI-22237. Restarting Storm Supervisor from Ambari always fails while Stop and Start works fine. (Arpit Khare, swagle via swagle)
     add 62a0a18  AMBARI-22242. Express Upgrade from IOP 4.2 to HDP 2.6.2 AMS failed to restart before finalizing. (swagle)
     add 3290677  AMBARI-22241: accumulo_script.py doesn't override init (Josh Elser via jluniya)
     add 8c017c1  AMBARI-22203. ZKFC start failed due to hadoop-hdfs-zkfc is not supported (partial revert) (ncole)
     add 43fb597  AMBARI-22243. Apache Hive 2 LLAP cluster doesn't have the metastore warehouse directory. (stoader)
     add 499fec3  AMBARI-22238 : Maven cleanup of ambari utility, logsearch and ambari metrics modules. (avijayan)
     add df10813  AMBARI-22232 : Need to add a new property to support proxy users for Atlas service. (Vishal Suvagia via mugdha)
     add e219186  AMBARI-22216. Ambari Schema Upgrade Failed during Ambari Upgrade - workaround (dlysnichenko)
     add d4458da  AMBARI-22232 : ADDENDUM Need to add a new property to support proxy users for Atlas service (Vishal Suvagia via mugdha).
     add 2a8ac0d  AMBARI-22223.jdbc(spark[2]) URLs not configured correctly for secure clusters(Prabhjyot Singh via Venkata Sairam)
     add 0317cf7  AMBARI-22233.Zeppelin service check failed during EU from 2.5 to 2.6 as ZeppelinServer can not be instantiated(Prabhjyot Singh Via Venkata Sairam)
     add 5f86f15  AMBARI-22220 - Should be able to switch the extension version to which a stack version is linked
     add 523f505  AMBARI-22232  - Need to add a new property to support proxy users property for Atlas service (Vishal Suvagia via jonathanhurley)
     add 4a22350  AMBARI-22245 - YARN Service Checks Fails Because of Old hadoop-client Classpath Entry (jonathanhurley)
     add 75102dc  AMBARI-22238 : Maven cleanup of ambari utility, logsearch and ambari metrics modules. (Commit 2) (avijayan)
     add 79d4ac2  AMBARI-22245 - YARN Service Checks Fails Because of Old hadoop-client Classpath Entry (part2) (jonathanhurley)
     add e19029c  AMBARI-22248. HBase default.rootdir config results in deploy failure if value is not overriden. (swagle)
     add d6cd303  AMBARI-22234 Optimizing Ranger KMS imports (mugdha)
     add ce29f8c  AMBARI-22246 Restart HDFS/JOURNALNODE failed on revert patch upgrade(dgrinenko)
     add 448d6a8  AMBARI-22255. Make the install modal full screen (alexantonenko)
     add 53f028e  AMBARI-22257. Metrics collector fails to stop after Datanode is stopped in distributed mode. (swagle)
     add c924ebd  AMBARI-22254. RU: RU failed on 'Updating configuration sqoop-atlas-application.properties' (ncole)
     add b9f2670  AMBARI-22258. Use correct property attribute setter fn(). while setting 'tez.runtime.io.sort.mb' maximum value.
     add 881e15d  Updated team page. (yusaku)
     add ee509e0  AMBARI-22250. Upgrade option not showing in stack versions. (Ishan Bhatt via yusaku)
     add 84342f6  AMBARI-22263. Disable Actions menu while Wizard in progress instead of hide (alexantonenko)
     add 29d1139  AMBARI-22265. Mahout service check failure after patch upgrade (ncole)
     add c9c96cd  Updated team page. (yusaku)
     add 37d59f2  Revert "AMBARI-22258. Use correct property attribute setter fn(). while setting 'tez.runtime.io.sort.mb' maximum value."
     add 3b5cbed  AMBARI-22258. Use correct property attribute setter fn(). while setting 'tez.runtime.io.sort.mb' maximum value.
     add 8852f33  AMBARI-22228 - Remove Remote Tea Runtime library dependency from Storm binaries (Arun Mahadevan via jonathanhurley)
     add 2ae81d9  AMBARI-22268. Remove "Hotfix" from Admin Register Version. (Ishan Bhatt via yusaku)
     add b4eddc9  AMBARI-22267 - Version registration failure during patch upgrade + Debian + Oracle run (jonathanhurley)
     add 15cec1c  AMBARI-22269 Log Search UI: provide navigation between Service and Audit Logs. (ababiichuk)
     add e76b563  AMBARI-22216. Ambari Schema Upgrade Failed during Ambari Upgrade (configuration: 2.5.2.0 -> 2.6.0.0 upgrade) (dlysnichenko)
     add 9ac8e53  AMBARI-22274. use different names for superset and druid metadata storage config sections. (nishantmonu51)
     add edd5ce9  AMBARI-22276 Ambari trunk builds failing in TestAmbariServer (dsen)
     add 6df6cbe  /AMBARI-22277. Ambari 3.0 : Outstanding UI issues (alexantonenko)
     add 0c188ae  AMBARI-21955. Update React version to 15.6.2 to get MIT license. (Sanket Shah via yusaku)
     add 371f1f3  AMBARI-21955. Update React version to 15.6.2 to get MIT license. (Sanket Shah via yusaku)
     add 5ebc2ac  Revert "AMBARI-21955. Update React version to 15.6.2 to get MIT license. (Sanket Shah via yusaku)"
     add cf5c068  Revert "AMBARI-21955. Update React version to 15.6.2 to get MIT license. (Sanket Shah via yusaku)"
     add daac7df  AMBARI-22287 Hosts and Alerts filter table re-implementation. (atkach)
     add 512c941  AMBARI-22016 - changeToSecureUid.sh might collide with existing user if it is not a local user (Aman Poonia via jonathanhurley)
     add cfd0f09  AMBARI-22286 - Remove jmxetric configs from storm-site childopts during upgrade (Arun Mahadevan via jonathanhurley)
     add 5ad8869  Revert "AMBARI-22016 - changeToSecureUid.sh might collide with existing user if it is not a local user (Aman Poonia via jonathanhurley)"
     add f537fe5  AMBARI-22288. Mark ZooKeeper server to provide rolling restart option (alexantonenko)
     add 5bdede5  AMBARI-21955. Update React version to 15.6.2 to get MIT license. (Sanket Shah via yusaku)
     add 467e344  AMBARI-22291 Adapt Repository Files For Existing Deployments for trunk (dgrinenko)
     add 2ee64af  Updated team page. (yusaku)
     add baa1fe6  AMBARI-22281. Avoid Log Feeder NPEs for logs of services not present on the node, but present on the cluster (mgergely)
     add 655e0a7  AMBARI-22299. Storm View: Update Node version for PPC support. (yusaku)
     add 479cf86  AMBARI-22304 Add search box filter to Config History page. (atkach)
     add d1d118d  Updated team page. (yusaku)
     add 83e8b67  AMBARI-22312 - Downgrade From HDP 2.6 to 2.5 Leaves 2.6 Hosts as CURRENT Instead of INSTALLED (jonathanhurley)
     add 4d3abaf  AMBARI-22305. Update Solr (Infra Solr + clients) version to 6.6.2 from 6.6.0 (oleewere)
     add 7e6036c  AMBARI-22310. Get rid of deprecated Solr usages (infra + logsearch) (oleewere)
     add 793ffeb  AMBARI-22316. Wrong placement of service versions in versions view (alexantonenko)
     add 4103b87  AMBARI-22314. Log Search: Add docker-compose file for creating ZooKeeper containers (oleewere)
     add e455a64  AMBARI-22326. String formatting problems
     add a386b35  AMBARI-22291 Adapt Repository Files For Existing Deployments for trunk UT (dgrinenko)
     add 600b06c  AMBARI-22315. Log Search: Add docker compose file for Solr (oleewere)
     add 45be766  AMBARI-22329. Log Search: Add docker compose file for Log Search server and Log Feeder (oleewere)
     add 4be5b8d  AMBARI-22329. ADDENDUM - Log Search: Add docker compose file for Log Search server and Log Feeder (oleewere)
     add 0041ab2  AMBARI-22333 Ambari 3.0: Implement new design for metrics of service summary. (atkach)
     add 9d6ac96  AMBARI-22298. Refresh config tags at RECONFIGURE command without explicitly setting forceRefreshConfigTags in request (magyari_sandor)
     add 6b7a7a7  AMBARI-21307 Feature for supporting LDAP configuration from the UI
     add 9fde9d7  AMBARI-22334. Remove python & npm install from Log Search docker container (Krisztian Kasa via oleewere)
     add f95296f  AMBARI-22328 Fix Log Search configuration dependencies (mgergely)
     add 6d676a9  AMBARI-22335. PERF stack: UI hangs to 2nd step (aonishuk)
     add ddb5a41  Merge branch 'trunk' into branch-feature-AMBARI-14714
     add 70077fe  Merge trunk with feature branch . Rat check fix (mradhakrishnan)
     add 6837c19  AMBARI-22325 Save/Retrieve v2 blueprints (benyoka)
     add eaeed81  AMBARI-22325 Save/Retrieve v2 blueprints fix: service ids stored in set in blueprint (benyoka)
     add 16913b2  AMBARI-22249. Add service group dependencies.(vbrodetskyi)
     add adc7060  AMBARI-22198. Implement read only API for getting stack level settings.
     add 72bac1f  AMBARI-22345. Add service dependencies.(vbrodetskyi)
     add 527c4a2  AMBARI-22309 Update db schema to use service_id instead of service_name (configs part) (dsen)
     add 5301b3f  AMBARI-22355 : New endpoint at ServiceLevel for configurations - POST, GET (mradhakrishnan)
     add b558eda  AMBARI-22380 : Add stack name and version to registry API (mradhakrishnan)
     add 4959206  AMBARI-22366. POST, GET and UPDATE API for cluster settings. (/clusters/{clusterName}/settings).
     add 55e450e  AMBARI-22355 : Addendum patch for adding service_id to clusterconfig (mradhakrishnan)
     add 6a78e1a  AMBARI-22249. Add service group dependencies. Part 2.(vbrodetskyi)
     add 19513a8  AMBARI-22345. Add service dependencies.Part 2.(vbrodetskyi)
     add 35d704c  AMBARI-22432 : Getting NPE when trying to get services information from service group (mradhakrishnan)
     add 1f17684  AMBARI-22493. Fix build for test classes in feature branch.(vbrodetskyi)
     add 99259e5  AMBARI-22509 Fix DatabaseConsistencyCheckHelper (dsen)
     add 586ab64  AMBARI-22515. Fix validators tests in feature branch.(vbrodetskyi)
     add e83bf1b  Merge trunk with feature branch and fix some UT compilation issues (mradhakrishnan)
     add f541d05  AMBARI-22551 : Getting NPE in ServiceComponentImpl.updateComponentInfo() (mradhakrishnan)
     add a1da993  AMBARI-22331. Log Search: add descriptions about how to use Log Search environment with docker compose (oleewere)
     add 8a8d48f  AMBARI-22344. Change Bulk delete host message. (Ishan Bhatt)
     add d03c24b  AMBARI-22278. Improve Kerberos principal and keytab accounting (echekanskiy)
     add a7f0f45  AMBARI-21508. Lifecycle: Start,Start All Visibility. (ishanbha)
     add f844e5f  AMBARI-22293. Improve KDC integration (rlevas)
     add fe02abf  AMBARI-22358 : VersionUtils incorrectly compares versions when it has double digits (mradhakrishnan)
     add b8f7369  AMBARI-22352 Ambari 3.0: Implement new design for Admin View. (atkach)
     add 1b020cd  AMBARI-22354 Service Action Menu issues. (atkach)
     add 68bc38e  AMBARI-22357. Log Search server should be able to run locally with dockerized dev env by default (oleewere)
     add 65ea560  AMBARI-22292. PU: Could not install version when only build changes (ncole)
     add afb9a66  AMBARI-22362  - Specify the Correct HIVE_BIN In Hive Scripts (jonathanhurley)
     add 0c6cf81  AMBARI-22301. HOU: Service desired repo versions are not being set (ncole)
     add 1fefbba  AMBARI-22320. Some pre-upgrade checks do not work when upgrading from IOP to HDP-2.6.3 (ncole)
     add 1afee60  AMBARI-22360. Send ClusterVersionSummary to install_packages and conf-select exclusion (ncole)
     add 976153f  AMBARI-22368 Log Search UI: move top menu down. (Istvan Tobias via ababiichuk)
     add ec3f1e4  AMBARI-22332 Falcon Service check failed during cluster deploy (dgrinenko)
     add f74b2f8  AMBARI-22374 Log Search UI: button with caret doesn't toggle dropdown is some cases. (Istvan Tobias via ababiichuk)
     add cbce5e8  AMBARI-22369. Remove Auto-Installation of Mysql Connector (ncole)
     add 38f6740  AMBARI-22376 Log Search UI: add navigation to first and last page. (Istvan Tobias via ababiichuk)
     add 063ba36  AMBARI-22337 each service should be able to implement server actions, package them add a jar to be loaded during EU (dili)
     add 654404d  AMBARI-22364. Log Feeder should be able to run locally with dockerized dev env by default (oleewere)
     add dd0421a  AMBARI-22377 Ambari 3.0: Implement new design for Admin View: Views page. (atkach)
     add b8004df  AMBARI-22372. DLM install failed on an unsecure upgraded cluster, due to missing configs. (Jaimin via Ishan)
     add 30a43c9  AMBARI-22266. Log Search server does not handle proxies properly (oleewere)
     add 0f67d1c  AMBARI-22361. Fix bug in base_alert when matching hostnames (stephanesan via dlysnichenko)
     add 08d3826  AMBARI-22293.  Improve KDC integration [addendum - fix unit tests] (rlevas)
     add b04e142  AMBARI-22379 : get_phoenix_query_server_hosts is undefined in hbase service_advisor. (Ted Yu via avijayan)
     add 5adcea7  AMBARI-22383. Remove Auto-Installation of LZO Libraries (ncole)
     add 7074e6e  AMBARI-22384. Disable HDP 2.3 stack. (swagle)
     add 5f714ce  AMBARI-22373.Disable auto config of interpreter.json at the time of installation(Prabhjyot Singh via Venkata Sairam)
     add 38476f7  AMBARI-22388 Log Search UI: restyle logs list. (Istvan Tobias via ababiichuk)
     add 444718a  AMBARI-22389. Exclude test scope jars from Log Search / Log Feeder rpm/deb packages (oleewere)
     add 780e91e  AMBARI-22370 - Remove HADOOP_HOME From Environment For Daemons (jonathanhurley)
     add e968b12  AMBARI-22398. Upstart is not able to stop the ambari-agent (aonishuk)
     add 430dcbf  AMBARI-22400 Ambari 3.0: Implement new design for Admin View: Cluster Information page. (atkach)
     add c693de3  AMBARI-22338 : Review Request for new HDP StackFeatures entry(mradhakrishnan on behalf of ydavis)
     add feccebc  AMBARI-22386 - Patch Upgrades Broken For Clients Due To Versioned LD Library (jonathanhurley)
     add 46ad6c6  AMBARI-22303. Spark history server is stopped (with umask 027 and custom spark log/pid dir) (aonishuk)
     add 98915a1  AMBARI-22346. Beeline connection hangs for longer time when connection to HS2 with metastore DB down (aonishuk)
     add 22b2d55  AMBARI-22412. Remove IPA integration from experimental status (rlevas)
     add ec02a14  AMBARI-22415. Blueprint deploys failing with missing smoke user keytab file (echekanskiy)
     add 068d82f  AMBARI-22411. Restart all required services failed when running cluster with several patch upgrades applied (ncole)
     add 7c4a7e4  AMBARI-22416 Log Search UI: fixes for filtering form. (ababiichuk)
     add 5122671  AMBARI-22417. Ambari checks fail with FIPS mode is activated on the OS (rlevas)
     add 76349ac  AMBARI-22387. Create a Pre-Upgrade Check Warning About LZO (dlysnichenko)
     add 6e706d4  AMBARI-22387. Create a Pre-Upgrade Check Warning About LZO. Fix import (dlysnichenko)
     add 18e5490  AMBARI-22390. Implement many-to-many relation between keytabs and principals (echekanskiy)
     add 4fa9ac5  AMBARI-22347.  Simplify Ambari configuration tables from AMBARI-21307 (rlevas)
     add 7428e51  AMBARI-22429 Log Search UI: implement logout. (Istvan Tobias via ababiichuk)
     add d11faab  AMBARI-22425 Ambari 3.0: Implement new design for Admin View: fix checkboxes. (atkach)
     add d0ef144  AMBARI-22439 Host check operation is being performed on all hosts during host add should not get stuck. (atkach)
     add ed7e121  AMBARI-22426. Push down Logger instances (adoroszlai)
     add 3297dfa  AMBARI-22438 Disable plugins for yum on yum list command (dgrinenko)
     add 869e1aa  AMBARI-22321 : Changed ambari version from 2.6.0.0 to 2.6.3.0. Addendum patch (mradhakrishnan on behalf of ydavis)
     add ba00ed9  Revert "AMBARI-22383. Remove Auto-Installation of LZO Libraries (ncole)"
     add 2b917f4  AMBARI-22443. Log Feeder: do not try to connect AMS, when it is disabled (oleewere)
     add a4e7bf3  AMBARI-22398. Upstart is not able to stop the ambari-agent - fix unit test
     add 1a99da4  AMBARI-22450. Log Search: reference Log Feeder IDE/maven dev setup in README.md (oleewere)
     add 2d81d49  AMBARI-22455 Ambari Logsearch Web unit tests are sometimes failing. (ababiichuk)
     add 3f2743b  AMBARI-22418.  Make Ambari configuration API consistent with existing API. (rlevas)
     add 99152d3  AMBARI-22448. Oozie Jobs on Hive Fail With Missing Tarball (ncole)
     add c67a324  AMBARI-22444 - Add Native Libraries To Tez Tarball (jonathanhurley)
     add 8fe6ac4  AMBARI-22445. Warn the user appropriately for default MySQL server install for Hive (vsubramanian)
     add 0936f46  AMBARI-22444 - Add Native Libraries To Tez Tarball (part2) (jonathanhurley)
     add 4042f9f  AMBARI-22260. Update Spark2 log4j default settings to latest. (sai.sai.shao via sshridhar).
     add f087874  AMBARI-22460. NFSGateway start failed (aonishuk)
     add a393926  AMBARI-22444 - Add Native Libraries To Tez Tarball (part3) (jonathanhurley)
     add f51b1cc  AMBARI-22431 Able to add config type if EU/RU of the same stack (minor version upgrade) (dili)
     add 365c91e  AMBARI-22444 - Add Native Libraries To Tez Tarball (part4) (jonathanhurley)
     add 18c4af4  AMBARI-22318 repositoryFile entity populating for wrong repository for RU (dgrinenko)
     add 1d1c556  AMBARI-22318 repositoryFile entity populating for wrong repository for RU. Unused imports check fix (dgrinenko)
     add e95d343  AMBARI-22464. disable hive.auto.convert.sortmerge.join in Hive configs in Ambari.(vbrodetskyi)
     add 430127b  AMBARI-22466 Ambari 3.0: Implement new design for Admin View: Views page tweaks. (atkach)
     add 5f8dcda  AMBARI-22461. VDF defined HDP-GPL repo should be tagged appropriately (ncole)
     add 2d9fd41  AMBARI-22461. VDF defined HDP-GPL repo should be tagged appropriately - remove unused imports
     add 8b82034  AMBARI-22463 Removing secure reference configs entries from stack for Ranger KMS service (mugdha)
     add 786d4b6  AMBARI-22462 Remove hard-code from StackAdvisorCommand requests to another resources (dgrinenko)
     add cc535c8  AMBARI-22477 Log Search UI: implement access logs table. (ababiichuk)
     add af8c401  AMBARI-22478 Ambari 3.0: Implement new design for Admin View: Edit cluster name. (atkach)
     add 9910c49  AMBARI-22471 : 'yum remove snappy' deletes ambari-metrics-collector. (avijayan)
     add 3f836c0  BUG-91896. Moving Metrics Collector Forces ZooKeeper Server Install on Target Host (alexantonenko)
     add f331f86  AMBARI-22453. ambari-server setup should surface GPL software agreement (aonishuk)
     add 930c7d5  AMBARI-22454. ambari-server upgrade to 2.6.1 should surface the GPL agreement (aonishuk)
     add 135d88b  AMBARI-22454. ambari-server upgrade to 2.6.1 should surface the GPL agreement (aonishuk)
     add 7eb14a0  AMBARI-22467. YARN, MapReduce2, Hive, and Oozie Should Conditionally Install LZO (aonishuk)
     add 8dd9acc  AMBARI-22494 Unable to install the cluster. (atkach)
     add b902c13  AMBARI-22467. YARN, MapReduce2, Hive, and Oozie Should Conditionally Install LZO (aonishuk)
     add 9572882  AMBARI-22497 Disk usage is not updated (dgrinenko)
     add 5dd334c  AMBARI-22467. YARN, MapReduce2, Hive, and Oozie Should Conditionally Install LZO (aonishuk)
     add b1acd1d  AMBARI-22469. Ambari upgrade failed (dlysnichenko)
     add cadbf35  AMBARI-22500. Modify AMBARI-22387 to Check for LZO + No Opt-in (dlysnichenko)
     add f343e8c  AMBARI-22501. stack advisor error while adding Druid service (alexantonenko)
     add 65ca084  AMBARI-22472. Ambari Upgrade 2.5 -> 2.6 : Update NodeManager's HSI identity 'llap_zk_hive' and 'llap_task_hive' to use '/HIVE/HIVE_SERVER/hive_server_hive' reference instead of creating the same identity again.
     add 9d3eeaa  AMBARI-22498. Remove trailing lines (if any) from llapstatus command before converting the o/p to JSON.
     add 2c46bb3  AMBARI-22486 - Conditionally Rebuild MapReduce and Tez Tarballs with LZO if Enabled (jonathanhurley)
     add 5d421b7  AMBARI-22454. ambari-server upgrade to 2.6.1 should surface the GPL agreement. Fix checkstyle. (Attila Doroszlai via mpapyrkovskyy)
     add bce0bd8  AMBARI-22503 Log Search UI: refine time range picker. (ababiichuk)
     add 1d4cbc8  AMBARI-22499. Ambari server becomes unusable when config properties are misconfigured (adoroszlai)
     add 9fc7223  AMBARI-22496. Admin View - Manage Versions page should show HDP-GPL repo if necessary (vsubramanian)
     add 6b17d01  AMBARI-22495. Installer - Select Version page should show HDP-GPL repo if necessary (vsubramanian)
     add 20dee7f  AMBARI-22467. YARN, MapReduce2, Hive, and Oozie Should Conditionally Install LZO (aonishuk)
     add 5136021  AMBARI-22502.Workflow Manager View - FS node will overwrite internal commands and replace them with blank "move" commands when reopening the node(Venkata Sairam)
     add 8e36662  AMBARI-21569.Users randomly getting "HDFS020 Could not write file" exceptions while running query from Hive View(Venkata Sairam)
     add 99b19e5  AMBARI-22508 Ambari 3.0: Implement new design for Admin View: User Management. (atkach)
     add 0249073  AMBARI-22513 Make yumrpm.py functions to use global defined commands (dgrinenko)
     add c5fe6cb  AMBARI-22510. Handle new error type from Stack Advisor (akovalenko)
     add c9936ad  AMBARI-22517. NPE during Ambari schema upgrade while updating Hive configs.
     add 3dca560  AMBARI-22402. PERF stack: Deploy fails due to common hooks being used instead of one specific to PERF (aonishuk)
     add 32e25b8  AMBARI-22519 Admin View: add ability to change roles. (atkach)
     add 1d9985c  AMBARI-22522 - Livy server fails to start during downgrade due to absence of 'conf' directory (jonathanhurley)
     add 74bc740  AMBARI-22521. Log Search: Adding new dynamic field for service logs (oleewere)
     add 0b98ccd  AMBARI-22524 : Journal Node start failing when AMS is installed during BP deploy. (avijayan)
     add b832f70  AMBARI-22520. PERF stack: deploy fails due to incorrect stack upgrade related information (aonishuk)
     add 530f1d5  AMBARI-22529. PERF stack fixes (aonishuk)
     add 33ee1a7  AMBARI-22526. Log Feeder: handle multiple '=' (split char) in key/value filter (oleewere)
     add 2bf3c8e  AMBARI-22531 Log Search UI: refine search box. (ababiichuk)
     add 393fdb8  AMBARI-22514. Initial implementation of Schedulable document deletion & archiving for Infra Solr (Krisztian Kasa via oleewere)
     add 3fa1289  AMBARI-22525 - ATS start failed during patch upgrade due to CNF SparkATSPlugin (jonathanhurley)
     add 73d99d8  AMBARI-22458 - SNMP Trap should contain sysuptime field filled (Amarnathreddy Pappu via jonathanhurley)
     add 020e152  AMBARI-22523. Service config changes on hdp + hdf cluster throws Consistency check failed. (mpapirkovskyy)
     add 82af6fb  AMBARI-22465 Post-Upgrade Tasks Use the Wrong Repository and Hooks Folders (dgrinenko)
     add aa652af  AMBARI-22458 - SNMP Trap should contain sysuptime field filled (unit test fixes) (jonathanhurley)
     add 11d7a6a  AMBARI-22527 : Error while viewing topology details - Storm View (Sanket Shah via mradhakrishnan)
     add 31a0f19  AMBARI-22535 - Remove extjs From Oozie Installations By Default (jonathanhurley)
     add 7fd404a  AMBARI-22458. SNMP Trap should have sysuptime field filled - checkstyle fix
     add 0cf8276  AMBARI-22534 Package install fails with HDP-2.5.3/2.6.4.0 version at atlas falcon plugin install (dgrinenko)
     add ff3eca0  AMBARI-22545 - Tie MapReduce to Hive and Tez For Patch Upgrades (jonathanhurley)
     add 7750398  AMBARI-22542. Upgrade Ember and jquery version for Ambari Views (pallavkul)
     add 41853a1  AMBARI-22484. Stack advisor should disallow lzo enable without accepting license agreement. (mpapirkovskyy)
     add 9bbc0ef  AMBARI-22480. Validate blueprint does not allow lzo enable without setup with license agreement. (mpapirkovskyy)
     add 82692bd  AMBARI-22480. Validate blueprint does not allow lzo enable without setup with license agreement. JavaDocs update. (mpapirkovskyy)
     add e12efe3  AMBARI-22484. Stack advisor should disallow lzo enable without accepting license agreement. Additional fixes. (mpapirkovskyy)
     add f6fd9b5  AMBARI-22480. Validate blueprint does not allow lzo enable without setup with license agreement. Added io.compression.codecs property validation. (mpapirkovskyy)
     add 0d7f609  AMBARI-22543. Log Search: backend should not return with 302 redirect if authentication fails (oleewere)
     add 323ce7a  AMBARI-22547 - History and Hive server start failed during IOP migration with AttributeError (jonathanhurley)
     add ca174fb  AMBARI-22554. UI should pass repo_name for repository validation (vsubramanian)
     add ff08592  AMBARI-22490. Uploading a Zero KB file to HDFS via File View Fails (pallavkul)
     add 19e6518  AMBARI-22550. Service install/start failure due to wrong version directory
     add 1f7bd75  AMBARI-22479 After removing force_delete_components option hosts are not deleted (dsen)
     add c3150a4  AMBARI-22548 Admin View: update toggle styles. (atkach)
     add 4240f84  AMBARI-22481. Make Ambari LDAP configuration API consistent with existing API (rlevas)
     add 1a803cc  AMBARI-22555. Update server setup to deny GPL as default. (swagle)
     add 63a1587  AMBARI-22564 Log Search UI: layout and behaviour changes for filtering. (ababiichuk)
     add d342949  AMBARI-22485 : Allow Ambari to support non-kerberos SASL mechanisms for Kafka (ydavis via mradhakrishnan)
     add 21e37b1  AMBARI-22505 : Kafka service check fails when using a non-root user in kerberized environment (ydavis via mradhakrishnan)
     add 4aef8fe  AMBARI-22555. Update server setup to deny GPL as default. Fixed for silent setup. (swagle)
     add f822778  AMBARI-22485 : Allow Ambari to support non-kerberos SASL mechanisms for Kafka - Addendum, missed the new files (ydavis via mradhakrishnan)
     add 195195f  AMBARI-22544. Upgrade from Ambari 2.5.2 to 2.6.0 fails. (mpapirkovskyy)
     add 58868f7  AMBARI-22565. Repository validation fails for HDP-GPL. (mpapirkovskyy)
     add f43277e  AMBARI-22566. Upgrade Angular for Ambari Admin View (alexantonenko)
     add b2655aa  AMBARI-22524 : Journal Node start failing when AMS is installed during BP deploy - Addendum patch. (avijayan)
     add 1efc4f0  Merge branch 'trunk' into branch-feature-AMBARI-14714 and fixed some ambari-admin-view issues (mradhakrishnan)
     add c52d8a7  AMBARI-22562 Remove stack metainfo.xml from management pack (dsen)
     add e99aece  Merge branch 'branch-feature-AMBARI-14714' of https://git-wip-us.apache.org/repos/asf/ambari into branch-feature-AMBARI-14714
     add c23a33f  AMBARI-22487 : New endpoint service_config_version for creating new config versions via service endpoint instead of cluster update (mradhakrishnan)
     add 10a19e5  Fix Merge issues for branch 'trunk' into branch-feature-AMBARI-14714 (mradhakrishnan)
     add 490808c  AMBARI-22604 Fix hostConfigMappingEntity cluster_id, concurrency in ClusterImpl and serviceConfigTypes initialization (dsen)
     add bcbacf0  AMBARI-22614. Fix unit tests in feature branch to make them workable.(vbrodetskyi)
     add 982ac4b  AMBARI-22602. Add 'clusterSettings' and 'stackSettings' parameters in Execution Commannd.
     add 63d938f  AMBARI-22602. Add 'clusterSettings' and 'stackSettings' parameters in Execution Commannd -- fix imports
     add bfeaa10  AMBARI-22604 Fix hostConfigMappingEntity cluster_id, concurrency in ClusterImpl and serviceConfigTypes initialization. Addendum patch (dsen)
     add 481175d  AMBARI-22614. Fix unit tests in feature branch to make them workable.(vbrodetskyi)
     add 0b1ce86  AMBARI-22650 Add ability to define packages at stack level (dsen)
     add 27d17cf  AMBARI-22196. yum repo file contains parsing errors due to initial whitespace (adoroszlai)
     add f953ceb  AMBARI-22249. Fix AmbariContext.serviceGroupDependencyResourceProvider initialization (adoroszlai)
     add 09724a2  AMBARI-22164. Fix wrong assignment due to leftover parameter name (adoroszlai)
     add 57051fa  AMBARI-22325 Revert adding repo_version column for stack table (benyoka)
     add 4e575a5  AMBARI-22660. Fix unit tests failing due to ServiceGroup issues (adoroszlai)
     add 61f0239  AMBARI-22649. Library for querying cluster_settings and stack_settings in command*.json.
     add 68c6221  AMBARI-22428 Update db schema to use service_id instead of service_name (requests part) (dsen)
     add 6a7f5b1  AMBARI-22345. Add service dependencies.(vbrodetskyi)
     add 765fb1c  AMBARI-22249. Add service group dependencies.(vbrodetskyi)
     add 98f68f9  AMBARI-22244. Use service type instead of service name - addendum (adoroszlai)
     add 3d536d6  AMBARI-22252. Revert Blueprint V2 changes
     add 4ec01a1  AMBARI-22253. Create default service group for blueprint (adoroszlai)
     add 071c2c4  Merge branch 'branch-feature-AMBARI-14714' into UI-refresh
     new 2685a0e  Merge pull request #157 from jgolieb/UI-refresh

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .gitignore                                         |     3 +
 ambari-admin/pom.xml                               |     2 +-
 .../app/assets}/fonts/Roboto-Regular-webfont.eot   |   Bin
 .../app/assets}/fonts/Roboto-Regular-webfont.svg   |     0
 .../app/assets}/fonts/Roboto-Regular-webfont.ttf   |   Bin
 .../app/assets}/fonts/Roboto-Regular-webfont.woff  |   Bin
 .../src/main/resources/ui/admin-web/app/index.html |    97 +-
 .../main/resources/ui/admin-web/app/scripts/app.js |     5 +-
 .../admin-web/app/scripts/controllers/AppCtrl.js   |   177 +
 .../app/scripts/controllers/NavbarCtrl.js          |   106 -
 .../app/scripts/controllers/SideNavCtrl.js         |    68 +
 .../ambariViews/CreateViewInstanceCtrl.js          |   406 +-
 .../controllers/ambariViews/ViewsListCtrl.js       |   361 +-
 .../controllers/clusters/ClusterInformationCtrl.js |   106 +
 .../clusters/ClustersManageAccessCtrl.js           |    97 -
 .../controllers/clusters/ExportBlueprintCtrl.js    |    58 -
 .../controllers/clusters/UserAccessListCtrl.js     |   351 -
 .../scripts/controllers/groups/GroupsCreateCtrl.js |    65 -
 .../scripts/controllers/groups/GroupsEditCtrl.js   |   180 -
 .../scripts/controllers/groups/GroupsListCtrl.js   |   106 -
 .../admin-web/app/scripts/controllers/mainCtrl.js  |   183 -
 .../stackVersions/StackVersionsEditCtrl.js         |    27 +-
 .../controllers/userManagement/GroupCreateCtrl.js  |   120 +
 .../controllers/userManagement/GroupEditCtrl.js    |   248 +
 .../controllers/userManagement/GroupsListCtrl.js   |   167 +
 .../controllers/userManagement/UserCreateCtrl.js   |   113 +
 .../controllers/userManagement/UserEditCtrl.js     |   364 +
 .../userManagement/UserManagementCtrl.js           |    23 +
 .../controllers/userManagement/UsersListCtrl.js    |   177 +
 .../scripts/controllers/users/UsersCreateCtrl.js   |    75 -
 .../app/scripts/controllers/users/UsersListCtrl.js |   122 -
 .../app/scripts/controllers/users/UsersShowCtrl.js |   290 -
 .../ui/admin-web/app/scripts/i18n.config.js        |    51 +-
 .../resources/ui/admin-web/app/scripts/routes.js   |   161 +-
 .../ui/admin-web/app/scripts/services/Cluster.js   |    90 +-
 .../ui/admin-web/app/scripts/services/Group.js     |   144 +-
 .../app/scripts/services/GroupConstants.js         |    38 -
 .../app/scripts/services/RoleDetailsModal.js       |     5 +-
 .../ui/admin-web/app/scripts/services/Stack.js     |    17 +-
 .../ui/admin-web/app/scripts/services/User.js      |    20 +-
 .../ui/admin-web/app/scripts/services/View.js      |    40 +-
 .../app/scripts/theme/bootstrap-ambari.js          |   269 +
 .../admin-web/app/styles/cluster-information.css   |    58 +
 .../resources/ui/admin-web/app/styles/main.css     |   696 +-
 .../app/styles/theme/bootstrap-ambari.css          |  1518 ++
 .../ui/admin-web/app/styles/toggle-switch.css      |    72 +
 .../resources/ui/admin-web/app/styles/top-nav.css  |   200 +
 .../ui/admin-web/app/styles/user-management.css    |    43 +
 .../resources/ui/admin-web/app/styles/views.css    |   105 +
 .../ui/admin-web/app/views/ambariViews/create.html |   204 -
 .../ui/admin-web/app/views/ambariViews/edit.html   |    37 +-
 .../admin-web/app/views/ambariViews/listTable.html |   110 -
 .../admin-web/app/views/ambariViews/listUrls.html  |   117 -
 .../app/views/ambariViews/modals/create.html       |   312 +-
 .../app/views/ambariViews/modals/edit.html         |   138 -
 .../admin-web/app/views/ambariViews/viewsList.html |   151 +
 .../admin-web/app/views/authentication/main.html   |    14 +-
 .../app/views/clusters/clusterInformation.html     |    87 +
 .../app/views/clusters/exportBlueprint.html        |    40 -
 .../admin-web/app/views/clusters/manageAccess.html |    63 -
 .../app/views/clusters/userAccessList.html         |   102 -
 .../ui/admin-web/app/views/groups/create.html      |    43 -
 .../ui/admin-web/app/views/groups/edit.html        |    98 -
 .../ui/admin-web/app/views/groups/list.html        |    79 -
 .../ui/admin-web/app/views/leftNavbar.html         |   126 -
 .../app/views/loginActivities/homeDirectory.html   |     6 +-
 .../app/views/loginActivities/loginMessage.html    |     6 +-
 .../resources/ui/admin-web/app/views/main.html     |    96 -
 .../app/views/modals/AddVersionModal.html          |    14 +-
 .../admin-web/app/views/remoteClusters/list.html   |    11 +-
 .../resources/ui/admin-web/app/views/sideNav.html  |    99 +
 .../ui/admin-web/app/views/stackVersions/list.html |    22 +-
 .../app/views/stackVersions/stackVersionPage.html  |    55 +-
 .../ui/admin-web/app/views/urls/create.html        |     6 +-
 .../ui/admin-web/app/views/urls/edit.html          |     6 +-
 .../app/views/userManagement/groupEdit.html        |   122 +
 .../app/views/userManagement/groupsList.html       |    94 +
 .../admin-web/app/views/userManagement/main.html   |    36 +
 .../modals/changePassword.html                     |     0
 .../views/userManagement/modals/groupCreate.html   |    87 +
 .../views/userManagement/modals/userCreate.html    |   152 +
 .../app/views/userManagement/userEdit.html         |   144 +
 .../app/views/userManagement/usersList.html        |   119 +
 .../ui/admin-web/app/views/users/create.html       |    82 -
 .../ui/admin-web/app/views/users/list.html         |    96 -
 .../ui/admin-web/app/views/users/show.html         |   122 -
 .../src/main/resources/ui/admin-web/bower.json     |    45 +-
 .../src/main/resources/ui/admin-web/gulpfile.js    |    10 +-
 .../src/main/resources/ui/admin-web/package.json   |    10 +-
 .../test/unit/controllers/AppCtrl_test.js          |   211 +
 .../controllers/ClusterInformationCtrl_test.js     |   102 +
 .../unit/controllers/CreateViewInstanceCtrl.js     |   135 -
 .../clusters/UserAccessListCtrl_test.js            |   820 -
 .../unit/controllers/groups/GroupsListCtrl_test.js |   129 -
 .../test/unit/controllers/mainCtrl_test.js         |   215 -
 .../userManagement/GroupsListCtrl_test.js          |   129 +
 .../userManagement/UsersListCtrl_test.js           |   344 +
 .../unit/controllers/users/UsersListCtrl_test.js   |   383 -
 .../admin-web/test/unit/services/Utility_test.js   |    11 +-
 .../src/main/python/ambari_agent/ActionQueue.py    |     5 +-
 .../src/main/python/ambari_agent/AmbariAgent.py    |     3 -
 .../src/main/python/ambari_agent/Hardware.py       |   130 +-
 .../src/main/python/ambari_agent/Heartbeat.py      |     8 +-
 .../src/main/python/ambari_agent/HostInfo.py       |    83 +-
 .../main/python/ambari_agent/alerts/base_alert.py  |     2 +-
 .../test/python/ambari_agent/TestAmbariAgent.py    |     4 +-
 .../src/test/python/ambari_agent/TestHardware.py   |    56 +-
 .../test/python/ambari_agent/TestRegistration.py   |     5 +-
 .../core/providers/package/__init__.py             |     2 +-
 .../core/providers/package/apt.py                  |    23 +-
 .../core/providers/package/yumrpm.py               |    85 +-
 .../core/providers/package/zypper.py               |    37 +-
 .../libraries/functions/__init__.py                |     2 +-
 .../libraries/functions/cluster_settings.py        |    60 +
 .../libraries/functions/component_version.py       |     9 +-
 .../libraries/functions/conf_select.py             |    58 +
 .../libraries/functions/constants.py               |     1 +
 .../libraries/functions/copy_tarball.py            |   201 +-
 .../libraries/functions/curl_krb_request.py        |    22 +-
 .../libraries/functions/get_lzo_packages.py        |    50 -
 .../libraries/functions/lzo_utils.py               |    93 +
 .../libraries/functions/package_conditions.py      |    14 +-
 .../libraries/functions/repository_util.py         |    79 +-
 .../libraries/functions/settings.py                |   112 +
 .../libraries/functions/stack_features.py          |    15 +-
 .../libraries/functions/stack_select.py            |    16 +-
 .../libraries/functions/stack_settings.py          |    71 +
 .../libraries/functions/stack_tools.py             |    15 +-
 .../libraries/functions/tar_archive.py             |     6 +-
 .../resource_management/libraries/script/script.py |     4 +-
 ambari-funtest/pom.xml                             |    67 -
 .../funtest/server/tests/DeleteServiceTest.java    |    11 +-
 ambari-infra/ambari-infra-assembly/pom.xml         |     4 +
 ambari-infra/ambari-infra-manager/pom.xml          |    11 +
 .../infra/job/archive/CompositeFileAction.java     |    46 +
 .../apache/ambari/infra/job/archive/Document.java  |    54 +
 .../infra/job/archive/DocumentDestination.java     |    23 +
 .../job/archive/DocumentExportConfiguration.java   |   118 +
 .../job/archive/DocumentExportJobListener.java     |    35 +
 .../job/archive/DocumentExportProperties.java      |   112 +
 .../job/archive/DocumentExportStepListener.java    |    47 +
 .../ambari/infra/job/archive/DocumentExporter.java |    99 +
 .../infra/job/archive/DocumentItemReader.java      |   135 +
 .../infra/job/archive/DocumentItemWriter.java      |    25 +
 .../ambari/infra/job/archive/DocumentIterator.java |    25 +
 .../ambari/infra/job/archive/DocumentSource.java   |    24 +
 .../ambari/infra/job/archive/FileAction.java       |    25 +
 .../infra/job/archive/LocalDocumentItemWriter.java |    72 +
 .../ambari/infra/job/archive/S3Properties.java     |    64 +
 .../ambari/infra/job/archive/S3Uploader.java       |    51 +
 .../infra/job/archive/SolrDocumentIterator.java    |    90 +
 .../infra/job/archive/SolrDocumentSource.java      |    68 +
 .../ambari/infra/job/archive/SolrQueryBuilder.java |   115 +
 .../infra/job/archive/SolrQueryProperties.java     |    69 +
 .../ambari/infra/job/archive/TarGzCompressor.java  |    50 +
 .../apache/ambari/infra/manager/JobManager.java    |    21 +-
 .../src/main/resources/infra-manager.properties    |    12 +
 .../src/main/resources/log4j2.xml                  |     2 +-
 .../infra/job/archive/DocumentExporterTest.java    |   147 +
 .../infra/job/archive/DocumentItemReaderTest.java  |   197 +
 .../job/archive/LocalDocumentItemWriterTest.java   |    98 +
 .../infra/job/archive/SolrQueryBuilderTest.java    |   113 +
 .../infra/solr/AmbariSolrCloudClientBuilder.java   |     4 +-
 .../solr/commands/CreateCollectionCommand.java     |    12 +-
 .../infra/solr/commands/CreateShardCommand.java    |     5 +-
 .../infra/solr/commands/GetShardsCommand.java      |     2 +-
 ambari-infra/pom.xml                               |     2 +-
 ambari-logsearch/README.md                         |    27 +-
 ambari-logsearch/ambari-logsearch-assembly/pom.xml |     4 +-
 .../ambari-logsearch-logfeeder/README.md           |    17 +-
 .../ambari-logsearch-logfeeder/pom.xml             |    10 +-
 .../ambari/logfeeder/filter/FilterKeyValue.java    |     4 +-
 .../apache/ambari/logfeeder/input/InputFile.java   |     4 +-
 .../logfeeder/metrics/LogFeederAMSClient.java      |     3 +
 .../ambari/logfeeder/metrics/MetricsManager.java   |     8 +-
 .../src/main/resources/log-samples/.gitignore      |     4 +
 .../resources/log-samples/logs/service_sample.txt  |     3 +
 .../log-samples/shipper-conf/global.config.json    |    10 +
 .../shipper-conf/input.config-sample.json          |    31 +
 .../shipper-conf/output.config-sample.json         |    34 +
 .../src/main/resources/log4j.xml                   |     4 +-
 .../src/main/resources/logfeeder.properties        |    31 +-
 .../logfeeder/metrics/MetricsManagerTest.java      |    10 +-
 .../ambari-logsearch-server/.gitignore             |     1 +
 ambari-logsearch/ambari-logsearch-server/README.md |    44 +-
 ambari-logsearch/ambari-logsearch-server/pom.xml   |     6 +-
 ambari-logsearch/ambari-logsearch-server/run.sh    |     2 +-
 .../configsets/hadoop_logs/conf/managed-schema     |     2 +
 .../ambari/logsearch/conf/AuthPropsConfig.java     |    18 +
 .../ambari/logsearch/conf/SecurityConfig.java      |     6 +-
 .../ambari/logsearch/solr/SolrConstants.java       |     1 +
 .../logsearch/solr/model/SolrServiceLogData.java   |    17 +
 .../filters/LogsearchAuthenticationEntryPoint.java |    15 +-
 .../src/main/resources/logsearch.properties        |    54 +-
 ambari-logsearch/ambari-logsearch-web/package.json |     2 +-
 ambari-logsearch/ambari-logsearch-web/pom.xml      |     3 +
 .../ambari-logsearch-web/src/app/app.module.ts     |    24 +-
 .../components/logs-table-component.spec.ts        |    61 +
 .../app/classes/components/logs-table-component.ts |    51 +
 .../src/app/classes/filtering.ts                   |    70 +
 .../src/app/classes/models/app-state.ts            |    15 +-
 .../src/app/classes/models/audit-log.ts            |     2 +-
 .../src/app/classes/models/node-item.ts            |    30 +
 .../src/app/classes/models/node.ts                 |    30 -
 .../src/app/classes/models/store.ts                |    18 +-
 .../src/app/classes/models/tab.ts                  |    49 +
 .../app/classes/queries/audit-logs-query-params.ts |     3 +-
 .../queries/service-logs-truncated-query-params.ts |     3 +-
 .../ambari-logsearch-web/src/app/classes/string.ts |    25 +
 .../accordion-panel/accordion-panel.component.less |     2 +-
 .../action-menu/action-menu.component.html         |    20 +
 .../action-menu/action-menu.component.less         |    24 +
 .../action-menu/action-menu.component.spec.ts      |    47 +
 .../action-menu/action-menu.component.ts           |   101 +
 .../src/app/components/app.component.html          |     4 +-
 .../src/app/components/app.component.less          |     7 +-
 .../src/app/components/app.component.spec.ts       |     4 +-
 .../src/app/components/app.component.ts            |     6 +-
 .../audit-logs-table.component.html                |    56 +
 .../audit-logs-table.component.less                |    21 +
 .../audit-logs-table.component.spec.ts             |   157 +
 .../audit-logs-table/audit-logs-table.component.ts |    55 +
 .../collapsible-panel.component.html               |    27 +
 .../collapsible-panel.component.less               |    42 +
 .../collapsible-panel.component.spec.ts            |   139 +
 .../collapsible-panel.component.ts                 |    89 +
 .../date-picker/date-picker.component.spec.ts      |     2 +
 .../date-picker/date-picker.component.ts           |    35 +-
 .../dropdown-button/dropdown-button.component.html |     8 +-
 .../dropdown-button/dropdown-button.component.less |    19 +-
 .../dropdown-button.component.spec.ts              |    24 +-
 .../dropdown-button/dropdown-button.component.ts   |    58 +-
 .../dropdown-list/dropdown-list.component.html     |     2 +-
 .../dropdown-list/dropdown-list.component.less     |     2 +-
 .../dropdown-list/dropdown-list.component.spec.ts  |    15 +-
 .../filter-button/filter-button.component.spec.ts  |    24 +-
 .../filter-button/filter-button.component.ts       |    35 +-
 .../filter-dropdown.component.spec.ts              |    32 +-
 .../filter-dropdown/filter-dropdown.component.ts   |    22 +-
 .../filters-panel/filters-panel.component.html     |    39 +-
 .../filters-panel/filters-panel.component.less     |    17 +-
 .../filters-panel/filters-panel.component.spec.ts  |    12 +-
 .../filters-panel/filters-panel.component.ts       |   126 +-
 .../log-context/log-context.component.spec.ts      |     9 +-
 .../log-file-entry/log-file-entry.component.less   |     2 +-
 .../components/log-level/log-level.component.html  |    18 +
 .../log-level/log-level.component.spec.ts          |    73 +
 .../components/log-level/log-level.component.ts    |    52 +
 .../log-message/log-message.component.html         |    24 +
 .../log-message/log-message.component.less         |    69 +
 .../log-message/log-message.component.spec.ts      |    64 +
 .../log-message/log-message.component.ts           |   129 +
 .../login-form/login-form.component.spec.ts        |     7 +-
 .../components/login-form/login-form.component.ts  |    34 +-
 .../logs-container/logs-container.component.html   |    48 +-
 .../logs-container/logs-container.component.less   |    10 +-
 .../logs-container.component.spec.ts               |    18 +-
 .../logs-container/logs-container.component.ts     |   121 +-
 .../components/logs-list/logs-list.component.html  |    65 -
 .../components/logs-list/logs-list.component.less  |   109 -
 .../logs-list/logs-list.component.spec.ts          |    95 -
 .../components/logs-list/logs-list.component.ts    |   150 -
 .../main-container/main-container.component.html   |    10 +-
 .../main-container/main-container.component.less   |     6 +-
 .../main-container.component.spec.ts               |    15 +-
 .../main-container/main-container.component.ts     |    51 +-
 .../src/app/components/main.less                   |    20 +
 .../menu-button/menu-button.component.html         |    17 +-
 .../menu-button/menu-button.component.less         |    33 +-
 .../menu-button/menu-button.component.spec.ts      |    24 +-
 .../menu-button/menu-button.component.ts           |   151 +-
 .../src/app/components/mixins.less                 |   222 +
 .../pagination-controls.component.html             |    15 +-
 .../pagination-controls.component.less             |     2 +-
 .../pagination-controls.component.spec.ts          |   101 +
 .../pagination-controls.component.ts               |    76 +-
 .../pagination/pagination.component.html           |     6 +-
 .../pagination/pagination.component.less           |     4 +-
 .../pagination/pagination.component.spec.ts        |     9 +-
 .../components/pagination/pagination.component.ts  |    12 +-
 .../search-box/search-box.component.html           |    24 +-
 .../search-box/search-box.component.less           |    29 +-
 .../components/search-box/search-box.component.ts  |   158 +-
 .../service-logs-table.component.html              |    77 +
 .../service-logs-table.component.less              |    96 +
 .../service-logs-table.component.spec.ts           |   126 +
 .../service-logs-table.component.ts                |   135 +
 .../src/app/components/tabs/tabs.component.html    |    25 +
 .../src/app/components/tabs/tabs.component.less    |    22 +
 .../src/app/components/tabs/tabs.component.spec.ts |   125 +
 .../src/app/components/tabs/tabs.component.ts      |    48 +
 .../time-histogram/time-histogram.component.less   |     3 +-
 .../time-range-picker.component.html               |     9 +-
 .../time-range-picker.component.less               |     2 +-
 .../time-range-picker.component.spec.ts            |    42 +-
 .../time-range-picker.component.ts                 |    61 +-
 .../timezone-picker.component.spec.ts              |    24 +-
 .../components/top-menu/top-menu.component.html    |    15 +-
 .../components/top-menu/top-menu.component.less    |     6 +-
 .../components/top-menu/top-menu.component.spec.ts |    64 +-
 .../app/components/top-menu/top-menu.component.ts  |   105 +-
 .../src/app/components/variables.less              |   129 +-
 .../ambari-logsearch-web/src/app/mock-data.ts      |     7 +-
 .../src/app/services/auth.service.spec.ts          |   133 +
 .../src/app/services/auth.service.ts               |   123 +
 .../app/services/component-actions.service.spec.ts |    15 +-
 .../src/app/services/component-actions.service.ts  |    69 +-
 .../services/component-generator.service.spec.ts   |    13 +-
 .../src/app/services/filtering.service.spec.ts     |    94 -
 .../src/app/services/filtering.service.ts          |   566 -
 .../app/services/logs-container.service.spec.ts    |    40 +-
 .../src/app/services/logs-container.service.ts     |   839 +-
 .../src/app/services/mock-api-data.service.ts      |    22 +
 .../src/app/services/storage/reducers.service.ts   |     4 +-
 .../src/app/services/storage/tabs.service.ts       |    33 +
 .../src/app/services/utils.service.spec.ts         |   285 +-
 .../src/app/services/utils.service.ts              |    67 +-
 .../ambari-logsearch-web/src/assets/i18n/en.json   |    18 +-
 .../ambari-logsearch-web/webpack.config.js         |    35 +-
 ambari-logsearch/docker/.gitignore                 |     1 +
 ambari-logsearch/docker/Dockerfile                 |    19 +-
 ambari-logsearch/docker/all.yml                    |    40 +
 ambari-logsearch/docker/bin/start.sh               |    92 +-
 ambari-logsearch/docker/docker-compose.yml         |    89 +
 ambari-logsearch/docker/logsearch-docker.sh        |    51 +-
 ambari-logsearch/docker/logsearch-logfeeder.yml    |    35 +
 ambari-logsearch/docker/logsearch-server.yml       |    35 +
 ambari-logsearch/docker/solr.yml                   |    34 +
 .../test-config/logfeeder/logfeeder.properties     |     2 +-
 ambari-logsearch/docker/zookeeper.yml              |    52 +
 ambari-logsearch/pom.xml                           |     3 +-
 ambari-metrics/ambari-metrics-assembly/pom.xml     |     3 +-
 ambari-metrics/ambari-metrics-common/pom.xml       |     6 +
 ambari-metrics/ambari-metrics-hadoop-sink/pom.xml  |     4 +-
 .../sink/timeline/HadoopTimelineMetricsSink.java   |     6 +-
 .../timeline/HadoopTimelineMetricsSinkTest.java    |    21 +-
 .../ambari-metrics-timelineservice/pom.xml         |    10 +
 ambari-project/pom.xml                             |    52 +-
 .../docs/security/kerberos/kerberos_service.md     |    22 +-
 ambari-server/pom.xml                              |    97 +-
 ambari-server/src/main/assemblies/server.xml       |    10 +
 .../server/ClusterSettingNotFoundException.java    |    35 +
 .../ambari/server/ServiceNotFoundException.java    |     7 +
 .../actionmanager/ExecutionCommandWrapper.java     |    47 +-
 .../ambari/server/actionmanager/Request.java       |     4 +
 .../apache/ambari/server/actionmanager/Stage.java  |     6 +-
 .../ambari/server/agent/CommandRepository.java     |    85 +
 .../ambari/server/agent/ExecutionCommand.java      |    70 +-
 .../ambari/server/agent/HeartbeatMonitor.java      |     3 +-
 .../ambari/server/agent/HeartbeatProcessor.java    |    72 +-
 .../server/api/handlers/BaseManagementHandler.java |     8 -
 .../ambari/server/api/handlers/CreateHandler.java  |    12 +-
 .../ambari/server/api/handlers/UpdateHandler.java  |     8 +-
 .../api/query/render/ClusterBlueprintRenderer.java |    21 +-
 .../api/resources/ClusterResourceDefinition.java   |     1 +
 .../ClusterSettingResourceDefinition.java          |    45 +
 .../api/resources/ResourceInstanceFactoryImpl.java |    23 +
 .../RootServiceComponentResourceDefinition.java    |     9 +-
 .../RootStackSettingsResourceDefinition.java       |    51 +
 .../ServiceDependencyResourceDefinition.java       |    45 +
 .../ServiceGroupDependencyResourceDefinition.java  |    41 +
 .../resources/ServiceGroupResourceDefinition.java  |     1 +
 .../api/resources/ServiceResourceDefinition.java   |     3 +-
 .../ambari/server/api/services/AmbariMetaInfo.java |    82 +-
 .../ambari/server/api/services/BaseService.java    |     5 +-
 .../ambari/server/api/services/ClusterService.java |    13 +
 .../server/api/services/ClusterSettingService.java |   276 +
 .../server/api/services/ConfigurationService.java  |    41 +-
 .../ambari/server/api/services/LoggingService.java |     4 +
 .../api/services/RootClusterSettingService.java    |     2 +-
 ...erviceComponentConfigurationRequestSwagger.java |    43 +
 ...rviceComponentConfigurationResponseSwagger.java |    43 +
 .../RootServiceComponentConfigurationService.java  |   241 +
 .../server/api/services/RootServiceService.java    |     7 +
 .../api/services/ServiceConfigVersionService.java  |    39 +-
 .../server/api/services/ServiceGroupKey.java       |    99 +
 .../server/api/services/ServiceGroupService.java   |   153 +-
 .../ambari/server/api/services/ServiceKey.java     |   129 +
 .../ambari/server/api/services/ServiceService.java |   126 +-
 .../ambari/server/api/services/StacksService.java  |    89 +
 .../api/services/serializers/JsonSerializer.java   |    38 +-
 .../StackAdvisorBlueprintProcessor.java            |    14 +-
 .../services/stackadvisor/StackAdvisorRequest.java |    31 +
 .../stackadvisor/commands/StackAdvisorCommand.java |    77 +-
 .../services/users/ActiveWidgetLayoutService.java  |     2 +-
 .../api/services/views/ViewInstanceService.java    |     2 +-
 .../server/checks/AbstractCheckDescriptor.java     |    81 +-
 .../ambari/server/checks/CheckDescription.java     |    17 +
 .../checks/DatabaseConsistencyCheckHelper.java     |   134 +-
 .../org/apache/ambari/server/checks/LZOCheck.java  |    80 +
 .../checks/RequiredServicesInRepositoryCheck.java  |    91 +
 .../server/checks/ServiceCheckValidityCheck.java   |     9 +-
 .../apache/ambari/server/checks/UpgradeCheck.java  |    11 +
 .../ambari/server/configuration/Configuration.java |    32 +
 .../server/controller/ActionExecutionContext.java  |    14 +-
 .../ambari/server/controller/ActionRequest.java    |    16 +-
 .../ambari/server/controller/ActionResponse.java   |    13 +-
 .../controller/AmbariActionExecutionHelper.java    |    93 +-
 .../AmbariCustomCommandExecutionHelper.java        |   352 +-
 .../server/controller/AmbariHandlerList.java       |     5 +-
 .../controller/AmbariManagementController.java     |    45 +-
 .../controller/AmbariManagementControllerImpl.java |   761 +-
 .../server/controller/AmbariManagementHelper.java  |    26 +
 .../ambari/server/controller/AmbariServer.java     |    15 +-
 .../server/controller/ClusterSettingRequest.java   |    83 +
 .../server/controller/ClusterSettingResponse.java  |   147 +
 .../server/controller/ConfigGroupRequest.java      |    12 +-
 .../server/controller/ConfigurationRequest.java    |    40 +-
 .../server/controller/ConfigurationResponse.java   |    66 +
 .../ambari/server/controller/ControllerModule.java |    18 +-
 .../server/controller/DeleteIdentityHandler.java   |     6 +-
 .../ambari/server/controller/KerberosHelper.java   |    21 +-
 .../server/controller/KerberosHelperImpl.java      |   181 +-
 .../server/controller/MaintenanceStateHelper.java  |    17 +-
 .../server/controller/RepositoryRequest.java       |    22 +-
 .../server/controller/RepositoryResponse.java      |    23 +-
 .../server/controller/ResourceProviderFactory.java |    36 +-
 .../ambari/server/controller/RootComponent.java    |    27 +
 .../ambari/server/controller/RootService.java      |    36 +
 .../controller/RootServiceResponseFactory.java     |    44 +-
 .../controller/ServiceComponentHostRequest.java    |    35 +-
 .../controller/ServiceConfigVersionRequest.java    |    36 +-
 .../controller/ServiceConfigVersionResponse.java   |    24 +
 .../controller/ServiceDependencyRequest.java       |   109 +
 .../controller/ServiceDependencyResponse.java      |   207 +
 .../controller/ServiceGroupDependencyRequest.java  |    96 +
 .../controller/ServiceGroupDependencyResponse.java |   177 +
 .../server/controller/ServiceGroupRequest.java     |    29 +-
 .../server/controller/ServiceGroupResponse.java    |     2 +-
 .../apache/ambari/server/controller/StackV2.java   |   605 -
 .../ambari/server/controller/StackV2Factory.java   |   251 -
 .../AbstractControllerResourceProvider.java        |    16 +-
 .../internal/AbstractPropertyProvider.java         |     4 +
 .../internal/AbstractProviderModule.java           |     4 +-
 .../internal/AbstractResourceProvider.java         |     2 +-
 .../internal/ActionResourceProvider.java           |     9 +
 .../internal/AlertDefinitionResourceProvider.java  |     4 +
 .../internal/AlertGroupResourceProvider.java       |     4 +
 .../controller/internal/AlertResourceProvider.java |     4 +
 .../internal/AlertTargetResourceProvider.java      |     4 +
 .../AmbariServerConfigurationCategory.java         |    69 +
 .../internal/AmbariServerConfigurationHandler.java |   110 +
 .../AmbariServerLDAPConfigurationHandler.java      |   172 +
 .../internal/ArtifactResourceProvider.java         |     4 +
 .../controller/internal/BaseClusterRequest.java    |    38 +-
 .../server/controller/internal/BaseProvider.java   |     6 +-
 .../internal/BlueprintConfigurationProcessor.java  |   294 +-
 .../internal/BlueprintResourceProvider.java        |     7 +-
 .../internal/BlueprintV2ResourceProvider.java      |   391 -
 .../internal/ClientConfigResourceProvider.java     |    69 +-
 .../internal/ClusterResourceProvider.java          |    12 +-
 .../internal/ClusterSettingResourceProvider.java   |   554 +
 .../ClusterStackVersionResourceProvider.java       |    94 +-
 ...ompatibleRepositoryVersionResourceProvider.java |     4 +
 .../internal/ComponentResourceProvider.java        |     5 +
 .../internal/ConfigGroupResourceProvider.java      |    48 +-
 .../controller/internal/ConfigurationContext.java  |    60 -
 .../internal/ConfigurationResourceProvider.java    |   100 +-
 .../internal/CredentialResourceProvider.java       |     4 +
 .../controller/internal/DefaultProviderModule.java |    30 +-
 .../internal/ExportBlueprintRequest.java           |    34 +-
 .../internal/ExtensionLinkResourceProvider.java    |    15 +
 .../controller/internal/GroupResourceProvider.java |     4 +
 .../internal/HostComponentResourceProvider.java    |     4 +
 .../HostKerberosIdentityResourceProvider.java      |    16 +-
 .../controller/internal/HostResourceProvider.java  |    56 +-
 .../internal/HostStackVersionResourceProvider.java |     9 +-
 .../controller/internal/HostStatusHelper.java      |     2 +-
 .../controller/internal/HttpPropertyProvider.java  |     2 +-
 .../internal/JsonHttpPropertyRequest.java          |     2 +-
 .../internal/LdapSyncEventResourceProvider.java    |     2 +-
 .../internal/MemberResourceProvider.java           |     4 +
 .../internal/OperationStatusMetaData.java          |    90 +
 .../internal/ProvisionClusterRequest.java          |    49 +-
 .../QuickLinkArtifactResourceProvider.java         |     4 +
 .../internal/RecommendationResourceProvider.java   |     4 +
 .../internal/RepositoryResourceProvider.java       |     6 +-
 .../controller/internal/RequestOperationLevel.java |    15 +-
 .../controller/internal/RequestResourceFilter.java |    13 +-
 .../internal/RequestResourceProvider.java          |    30 +-
 .../RoleAuthorizationResourceProvider.java         |     4 +
 .../RootServiceComponentConfigurationHandler.java  |   114 +
 ...erviceComponentConfigurationHandlerFactory.java |    54 +
 ...viceComponentConfigurationResourceProvider.java |   445 +
 .../RootServiceComponentPropertyProvider.java      |     4 +-
 .../RootServiceComponentResourceProvider.java      |     4 +-
 .../RootStackSettingsResourceProvider.java         |   177 +
 .../controller/internal/ScaleClusterRequest.java   |    18 +-
 .../ServiceConfigVersionResourceProvider.java      |   121 +-
 .../ServiceDependencyResourceProvider.java         |   548 +
 .../ServiceGroupDependencyResourceProvider.java    |   505 +
 .../internal/ServiceGroupResourceProvider.java     |     5 +-
 .../internal/ServiceResourceProvider.java          |    16 +-
 .../internal/StackAdvisorResourceProvider.java     |    13 +-
 .../internal/StackArtifactResourceProvider.java    |     5 +
 .../controller/internal/StageResourceProvider.java |     4 +
 .../controller/internal/TaskResourceProvider.java  |     4 +
 .../internal/ThemeArtifactResourceProvider.java    |     4 +
 .../server/controller/internal/UnitUpdater.java    |    15 +-
 .../internal/UpgradeItemResourceProvider.java      |     4 +
 .../internal/UpgradeResourceProvider.java          |    68 +-
 .../controller/internal/UserResourceProvider.java  |     4 +
 .../internal/ValidationResourceProvider.java       |     4 +
 .../VersionDefinitionResourceProvider.java         |    13 +
 .../controller/jdbc/JDBCResourceProvider.java      |     2 +-
 .../server/controller/jmx/JMXPropertyProvider.java |     2 +-
 .../metrics/MetricsCollectorHAClusterState.java    |     2 +-
 .../metrics/MetricsCollectorHAManager.java         |     2 +-
 .../metrics/MetricsDownsamplingMethod.java         |     2 +-
 .../metrics/MetricsPropertyProvider.java           |     2 +-
 .../metrics/MetricsReportPropertyProvider.java     |     2 +-
 .../metrics/RestMetricsPropertyProvider.java       |     2 +-
 .../metrics/ThreadPoolEnabledPropertyProvider.java |     4 +
 .../metrics/ganglia/GangliaPropertyProvider.java   |     2 +-
 .../ganglia/GangliaReportPropertyProvider.java     |     2 +-
 .../metrics/timeline/AMSPropertyProvider.java      |     3 +
 .../timeline/AMSReportPropertyProvider.java        |     3 +
 .../ambari/server/controller/spi/Resource.java     |    11 +
 .../controller/utilities/DatabaseChecker.java      |     2 +-
 .../state/DefaultServiceCalculatedState.java       |     2 +-
 .../state/FlumeServiceCalculatedState.java         |     4 +
 .../state/HBaseServiceCalculatedState.java         |     4 +
 .../state/HDFSServiceCalculatedState.java          |     4 +
 .../state/HiveServiceCalculatedState.java          |     4 +
 .../state/OozieServiceCalculatedState.java         |     4 +
 .../state/YARNServiceCalculatedState.java          |     4 +
 .../server/customactions/ActionDefinition.java     |    15 +-
 .../customactions/ActionDefinitionManager.java     |    13 +-
 .../server/customactions/ActionDefinitionSpec.java |    10 +
 .../events/AmbariConfigurationChangedEvent.java    |    36 +
 .../apache/ambari/server/events/AmbariEvent.java   |    11 +-
 .../ambari/server/events/ClusterSettingEvent.java  |    46 +
 .../events/ServiceComponentUninstalledEvent.java   |    12 +-
 .../listeners/alerts/AlertReceivedListener.java    |    10 +-
 .../alerts/AlertStateChangedListener.java          |     6 +-
 .../org/apache/ambari/server/ldap/LdapModule.java  |    78 +
 .../ldap/domain/AmbariLdapConfiguration.java       |   206 +
 .../domain/AmbariLdapConfigurationFactory.java     |    34 +
 .../ldap/domain/AmbariLdapConfigurationKeys.java   |    83 +
 .../service/AmbariLdapConfigurationProvider.java   |   114 +
 .../server/ldap/service/AmbariLdapException.java   |    33 +
 .../server/ldap/service/AmbariLdapFacade.java      |   138 +
 .../server/ldap/service/AttributeDetector.java     |    41 +
 .../service/LdapAttributeDetectionService.java     |    40 +
 .../ldap/service/LdapConfigurationService.java     |    60 +
 .../ldap/service/LdapConnectionConfigService.java  |    36 +
 .../ambari/server/ldap/service/LdapFacade.java     |    59 +
 .../ads/DefaultLdapAttributeDetectionService.java  |   200 +
 .../ads/DefaultLdapConfigurationService.java       |   213 +
 .../ads/DefaultLdapConnectionConfigService.java    |   113 +
 .../service/ads/LdapConnectionTemplateFactory.java |   111 +
 .../ads/detectors/AttributeDetectorFactory.java    |    75 +
 .../ads/detectors/ChainedAttributeDetector.java    |    73 +
 .../ads/detectors/GroupMemberAttrDetector.java     |    65 +
 .../ads/detectors/GroupNameAttrDetector.java       |    69 +
 .../ads/detectors/GroupObjectClassDetector.java    |    69 +
 .../OccurrenceAndWeightBasedDetector.java          |   143 +
 .../ads/detectors/UserGroupMemberAttrDetector.java |    63 +
 .../ads/detectors/UserNameAttrDetector.java        |    71 +
 .../ads/detectors/UserObjectClassDetector.java     |    69 +
 .../ambari/server/metadata/ActionMetadata.java     |     8 +-
 .../metadata/AmbariServiceAlertDefinitions.java    |    20 +-
 .../apache/ambari/server/mpack/MpackGenerator.java |    20 +-
 .../apache/ambari/server/mpack/MpackManager.java   |    61 +
 .../dispatchers/AmbariSNMPDispatcher.java          |    10 +-
 .../apache/ambari/server/orm/DBAccessorImpl.java   |    24 +-
 .../ambari/server/orm/cache/HostConfigMapping.java |     7 +-
 .../server/orm/cache/HostConfigMappingImpl.java    |    30 +-
 .../ambari/server/orm/dao/AlertDefinitionDAO.java  |     7 +-
 .../ambari/server/orm/dao/AlertDispatchDAO.java    |     4 +-
 .../server/orm/dao/AmbariConfigurationDAO.java     |   179 +
 .../ambari/server/orm/dao/BlueprintV2DAO.java      |   124 -
 .../ambari/server/orm/dao/ClusterServiceDAO.java   |    32 +
 .../ambari/server/orm/dao/ClusterSettingDAO.java   |   100 +
 .../org/apache/ambari/server/orm/dao/DaoUtils.java |    13 +-
 .../server/orm/dao/HostConfigMappingDAO.java       |     8 +-
 .../ambari/server/orm/dao/KerberosKeytabDAO.java   |   110 +
 .../server/orm/dao/KerberosPrincipalDAO.java       |     7 +
 .../server/orm/dao/KerberosPrincipalHostDAO.java   |    40 +-
 .../ambari/server/orm/dao/ServiceConfigDAO.java    |    46 +-
 .../ambari/server/orm/dao/ServiceGroupDAO.java     |    50 +-
 .../orm/entities/AmbariConfigurationEntity.java    |   112 +
 .../orm/entities/AmbariConfigurationEntityPK.java  |    88 +
 .../server/orm/entities/BlueprintEntity.java       |     1 +
 .../server/orm/entities/BlueprintV2Entity.java     |    90 -
 .../server/orm/entities/ClusterConfigEntity.java   |    11 +
 .../ambari/server/orm/entities/ClusterEntity.java  |    11 +
 .../server/orm/entities/ClusterServiceEntity.java  |    41 +-
 .../server/orm/entities/ClusterSettingEntity.java  |   131 +
 .../server/orm/entities/ConfigGroupEntity.java     |    41 +-
 .../orm/entities/HostComponentStateEntity.java     |     2 +-
 .../orm/entities/HostConfigMappingEntity.java      |    59 +-
 .../orm/entities/HostGroupComponentEntity.java     |    16 +-
 .../orm/entities/HostGroupComponentEntityPK.java   |    36 -
 .../server/orm/entities/KerberosKeytabEntity.java  |    86 +
 .../orm/entities/KerberosPrincipalHostEntity.java  |    57 +-
 .../entities/KerberosPrincipalHostEntityPK.java    |    19 +-
 .../orm/entities/RemoteAmbariClusterEntity.java    |     2 +-
 .../server/orm/entities/RepositoryEntity.java      |    53 +-
 .../orm/entities/RepositoryVersionEntity.java      |    32 +-
 .../orm/entities/RequestOperationLevelEntity.java  |    12 +
 .../orm/entities/RequestResourceFilterEntity.java  |    12 +
 .../server/orm/entities/ServiceConfigEntity.java   |    66 +-
 .../orm/entities/ServiceDependencyEntity.java      |   154 +
 .../orm/entities/ServiceDesiredStateEntity.java    |     4 +-
 .../orm/entities/ServiceGroupDependencyEntity.java |   119 +
 .../server/orm/entities/ServiceGroupEntity.java    |    34 +-
 .../ambari/server/orm/entities/StackEntity.java    |    13 +-
 .../orm/entities/TopologyConfigurationsEntity.java |   148 -
 .../server/orm/entities/TopologyRequestEntity.java |    40 +-
 .../ResourceLevelClusterSettingManager.java        |   168 -
 .../ResourceLevelClusterSettingManagerFactory.java |    34 -
 .../server/resources/RootLevelSettingsManager.java |   172 +
 .../resources/RootLevelSettingsManagerFactory.java |    36 +
 .../AmbariLdapAuthenticationProvider.java          |     2 +-
 .../security/authorization/RoleAuthorization.java  |    95 +-
 .../security/encryption/CredentialProvider.java    |     2 +-
 .../server/serveraction/ServerActionExecutor.java  |   147 +-
 .../kerberos/ADKerberosOperationHandler.java       |    22 +-
 .../AbstractPrepareKerberosServerAction.java       |    68 +-
 .../serveraction/kerberos/CleanupServerAction.java |    14 +-
 .../server/serveraction/kerberos/Component.java    |    13 +-
 .../ConfigureAmbariIdentitiesServerAction.java     |    31 +-
 .../kerberos/CreateKeytabFilesServerAction.java    |    65 +-
 .../kerberos/CreatePrincipalsServerAction.java     |    56 +-
 .../kerberos/DestroyPrincipalsServerAction.java    |     3 +-
 .../kerberos/IPAKerberosOperationHandler.java      |  1067 +-
 .../kerberos/KDCKerberosOperationHandler.java      |   391 +
 .../kerberos/KerberosIdentityDataFile.java         |     2 -
 .../kerberos/KerberosIdentityDataFileWriter.java   |     9 +-
 .../kerberos/KerberosOperationHandler.java         |    64 +-
 .../kerberos/KerberosServerAction.java             |    48 +-
 .../kerberos/MITKerberosOperationHandler.java      |   406 +-
 .../PrepareDisableKerberosServerAction.java        |     2 +-
 .../PrepareEnableKerberosServerAction.java         |     2 +-
 .../PrepareKerberosIdentitiesServerAction.java     |     8 +-
 .../stageutils/ResolvedKerberosKeytab.java         |   257 +
 .../upgrades/AtlasProxyUserConfigCalculation.java  |    62 +
 .../serveraction/upgrades/ConfigureAction.java     |    12 +-
 .../upgrades/CreateAndConfigureAction.java         |   164 +
 .../upgrades/FinalizeUpgradeAction.java            |    74 +-
 .../upgrades/PreconfigureKerberosAction.java       |    63 +-
 .../ambari/server/stack/ExtensionHelper.java       |    31 +-
 .../ambari/server/stack/MasterHostResolver.java    |     2 +-
 .../server/stack/ModuleFileUnmarshaller.java       |     4 +-
 .../org/apache/ambari/server/stack/RepoUtil.java   |     1 +
 .../ambari/server/stack/ServiceDirectory.java      |    29 +
 .../apache/ambari/server/stack/ServiceModule.java  |     8 +
 .../apache/ambari/server/stack/StackManager.java   |     5 -
 .../apache/ambari/server/stack/StackModule.java    |    21 +-
 .../org/apache/ambari/server/state/Cluster.java    |   182 +-
 .../apache/ambari/server/state/ClusterSetting.java |    56 +
 .../ambari/server/state/ClusterSettingFactory.java |    33 +
 .../ambari/server/state/ClusterSettingImpl.java    |   201 +
 .../apache/ambari/server/state/ConfigFactory.java  |     2 +-
 .../apache/ambari/server/state/ConfigHelper.java   |    50 +-
 .../org/apache/ambari/server/state/ConfigImpl.java |    15 +-
 .../ambari/server/state/ConfigMergeHelper.java     |     4 +-
 .../apache/ambari/server/state/DesiredConfig.java  |    51 +-
 .../org/apache/ambari/server/state/OsSpecific.java |   250 +
 .../apache/ambari/server/state/RepositoryInfo.java |    23 +-
 .../apache/ambari/server/state/RepositoryType.java |    18 +
 .../org/apache/ambari/server/state/Service.java    |    13 +
 .../apache/ambari/server/state/ServiceFactory.java |     4 +
 .../apache/ambari/server/state/ServiceGroup.java   |    25 +-
 .../ambari/server/state/ServiceGroupFactory.java   |     6 +-
 .../ambari/server/state/ServiceGroupImpl.java      |   176 +-
 .../apache/ambari/server/state/ServiceImpl.java    |   178 +-
 .../apache/ambari/server/state/ServiceInfo.java    |    28 +-
 .../ambari/server/state/ServiceOsSpecific.java     |   249 -
 .../org/apache/ambari/server/state/StackInfo.java  |    56 +
 .../apache/ambari/server/state/UpgradeContext.java |    57 +-
 .../apache/ambari/server/state/UpgradeHelper.java  |    25 +-
 .../server/state/alert/AlertDefinitionHash.java    |     8 +-
 .../ambari/server/state/cluster/ClusterImpl.java   |   726 +-
 .../server/state/configgroup/ConfigGroup.java      |    11 +-
 .../state/configgroup/ConfigGroupFactory.java      |     3 +-
 .../server/state/configgroup/ConfigGroupImpl.java  |    70 +-
 .../apache/ambari/server/state/host/HostImpl.java  |     3 +-
 .../state/repository/ClusterVersionSummary.java    |     3 +
 .../state/repository/ServiceVersionSummary.java    |    11 +-
 .../server/state/repository/StackPackage.java      |    69 +
 .../state/repository/VersionDefinitionXml.java     |   112 +-
 .../state/services/AmbariServerAlertService.java   |     4 +-
 .../state/services/MetricsRetrievalService.java    |     2 +-
 .../apache/ambari/server/state/stack/OsFamily.java |     2 +-
 .../apache/ambari/server/state/stack/RepoTag.java  |    34 +
 .../ambari/server/state/stack/RepositoryXml.java   |    13 +
 .../server/state/stack/StackMetainfoXml.java       |    44 +-
 .../ambari/server/state/stack/UpgradePack.java     |    33 +-
 .../state/stack/upgrade/ClusterGrouping.java       |    15 +
 .../server/state/stack/upgrade/ConfigureTask.java  |    16 +
 .../stack/upgrade/CreateAndConfigureTask.java      |    57 +
 .../stack/upgrade/RepositoryVersionHelper.java     |   373 +-
 .../ambari/server/state/stack/upgrade/Task.java    |     6 +-
 .../svccomphost/ServiceComponentHostImpl.java      |     3 +-
 .../ambari/server/topology/AmbariContext.java      |   257 +-
 .../apache/ambari/server/topology/Blueprint.java   |     2 +-
 .../ambari/server/topology/BlueprintFactory.java   |     3 +-
 .../ambari/server/topology/BlueprintImpl.java      |     3 +-
 .../ambari/server/topology/BlueprintImplV2.java    |   396 -
 .../apache/ambari/server/topology/BlueprintV2.java |   251 -
 .../ambari/server/topology/BlueprintV2Factory.java |   196 -
 .../ambari/server/topology/BlueprintValidator.java |     3 +-
 .../server/topology/BlueprintValidatorImpl.java    |    91 +-
 .../server/topology/BlueprintValidatorV2.java      |    43 -
 .../topology/ClusterConfigurationRequest.java      |    66 +-
 .../ambari/server/topology/ClusterTopology.java    |    15 +-
 .../server/topology/ClusterTopologyImpl.java       |    84 +-
 .../apache/ambari/server/topology/ComponentV2.java |   138 -
 .../ambari/server/topology/Configurable.java       |    40 -
 .../ambari/server/topology/Configuration.java      |     7 -
 .../topology/GPLLicenseNotAcceptedException.java   |    28 +
 .../ambari/server/topology/HostGroupImpl.java      |     2 +
 .../ambari/server/topology/HostGroupInfo.java      |    17 +-
 .../apache/ambari/server/topology/HostGroupV2.java |   137 -
 .../ambari/server/topology/HostGroupV2Impl.java    |   169 -
 .../apache/ambari/server/topology/HostRequest.java |    38 +-
 .../ambari/server/topology/LogicalRequest.java     |     4 +-
 .../ambari/server/topology/PersistedStateImpl.java |    60 +-
 .../ambari/server/topology/RepositoryVersion.java  |    71 -
 .../server/topology/SecurityConfiguration.java     |     7 +-
 .../org/apache/ambari/server/topology/Service.java |   152 -
 .../ambari/server/topology/ServiceGroup.java       |    92 -
 .../apache/ambari/server/topology/ServiceId.java   |    79 -
 .../org/apache/ambari/server/topology/Setting.java |    18 +-
 .../ambari/server/topology/TopologyManager.java    |    20 +-
 .../ambari/server/topology/TopologyRequest.java    |    10 +-
 .../topology/tasks/PersistHostResourcesTask.java   |    12 +-
 .../validators/ClusterConfigTypeValidator.java     |     8 +-
 .../topology/validators/HiveServiceValidator.java  |    47 +-
 .../RequiredConfigPropertiesValidator.java         |    91 +-
 .../validators/RequiredPasswordValidator.java      |    30 +-
 .../validators/StackConfigTypeValidator.java       |    31 +-
 .../server/topology/validators/UnitValidator.java  |    34 +-
 .../server/upgrade/AbstractUpgradeCatalog.java     |    17 +-
 .../ambari/server/upgrade/SchemaUpgradeHelper.java |    30 +-
 .../ambari/server/upgrade/UpgradeCatalog.java      |     6 +
 .../ambari/server/upgrade/UpgradeCatalog260.java   |   224 +-
 .../ambari/server/upgrade/UpgradeCatalog261.java   |   119 +
 .../ambari/server/upgrade/UpgradeCatalog300.java   |    51 +-
 .../apache/ambari/server/utils/RetryHelper.java    |     2 +-
 .../org/apache/ambari/server/utils/StageUtils.java |     2 +-
 .../apache/ambari/server/utils/VersionUtils.java   |    46 +-
 .../server/view/ViewDataMigrationUtility.java      |     2 +-
 .../apache/ambari/server/view/ViewExtractor.java   |     2 +-
 .../apache/ambari/server/view/ViewRegistry.java    |     2 +-
 .../server/view/ViewSubResourceProvider.java       |     4 +
 .../server/view/persistence/DataStoreImpl.java     |     2 +-
 ambari-server/src/main/python/ambari-server.py     |     2 +
 .../python/ambari_server/serverConfiguration.py    |    24 +
 .../src/main/python/ambari_server/serverSetup.py   |     7 +-
 .../src/main/python/ambari_server/serverUpgrade.py |    22 +-
 .../src/main/resources/Ambari-DDL-Derby-CREATE.sql |   182 +-
 .../src/main/resources/Ambari-DDL-MySQL-CREATE.sql |   177 +-
 .../main/resources/Ambari-DDL-Oracle-CREATE.sql    |   186 +-
 .../main/resources/Ambari-DDL-Postgres-CREATE.sql  |   179 +-
 .../resources/Ambari-DDL-SQLAnywhere-CREATE.sql    |   177 +-
 .../main/resources/Ambari-DDL-SQLServer-CREATE.sql |   178 +-
 .../src/main/resources/META-INF/persistence.xml    |     6 +-
 .../src/main/resources/cluster-settings.xml        |    12 +-
 .../1.6.1.2.2.0/package/scripts/accumulo_script.py |     1 +
 .../0.1.0/package/scripts/metrics_collector.py     |     4 +-
 .../0.1.0/package/scripts/metrics_grafana.py       |     4 +-
 .../0.1.0/package/scripts/metrics_monitor.py       |     4 +-
 .../ATLAS/0.1.0.2.3/package/scripts/params.py      |     2 +-
 .../ATLAS/0.7.0.3.0/package/scripts/params.py      |     2 +-
 .../DRUID/0.10.1/package/scripts/druid.py          |     3 +-
 .../DRUID/0.10.1/package/scripts/druid_node.py     |     1 +
 .../DRUID/0.10.1/package/scripts/params.py         |     5 +-
 .../common-services/DRUID/0.10.1/themes/theme.json |    26 +-
 .../FALCON/0.5.0.2.1/package/scripts/falcon.py     |    11 +-
 .../HBASE/0.96.0.2.0/configuration/hbase-site.xml  |    17 +-
 .../HBASE/2.0.0.3.0/service_advisor.py             |    12 +-
 .../common-services/HDFS/2.1.0.2.0/metainfo.xml    |    30 -
 .../HDFS/2.1.0.2.0/package/scripts/hdfs.py         |     8 +-
 .../2.1.0.2.0/package/scripts/install_params.py    |     4 -
 .../HDFS/2.1.0.2.0/package/scripts/params_linux.py |     5 -
 .../common-services/HDFS/3.0.0.3.0/metainfo.xml    |    30 -
 .../HDFS/3.0.0.3.0/package/scripts/hdfs.py         |     8 +-
 .../3.0.0.3.0/package/scripts/install_params.py    |     4 -
 .../HDFS/3.0.0.3.0/package/scripts/params_linux.py |     4 -
 .../HIVE/0.12.0.2.0/configuration/hive-site.xml    |   244 +-
 .../common-services/HIVE/0.12.0.2.0/metainfo.xml   |     5 -
 .../package/alerts/alert_hive_thrift_port.py       |     3 +-
 .../0.12.0.2.0/package/files/startMetastore.sh     |     4 +-
 .../HIVE/0.12.0.2.0/package/scripts/hive.py        |    49 +-
 .../0.12.0.2.0/package/scripts/hive_interactive.py |    13 +
 .../package/scripts/hive_server_interactive.py     |    20 +-
 .../0.12.0.2.0/package/scripts/hive_service.py     |    10 +-
 .../package/scripts/hive_service_interactive.py    |     5 +-
 .../0.12.0.2.0/package/scripts/params_linux.py     |     7 +-
 .../0.12.0.2.0/package/scripts/service_check.py    |     6 +-
 .../0.12.0.2.0/package/scripts/webhcat_service.py  |    19 +-
 .../HIVE/2.1.0.3.0/configuration/hive-site.xml     |    48 +
 .../common-services/HIVE/2.1.0.3.0/metainfo.xml    |    10 -
 .../HIVE/2.1.0.3.0/package/files/startMetastore.sh |     4 +-
 .../HIVE/2.1.0.3.0/package/scripts/hive.py         |    35 +
 .../2.1.0.3.0/package/scripts/hive_interactive.py  |    13 +
 .../HIVE/2.1.0.3.0/package/scripts/hive_service.py |     8 +-
 .../package/scripts/hive_service_interactive.py    |     5 +-
 .../HIVE/2.1.0.3.0/package/scripts/params_linux.py |    14 +-
 .../2.1.0.3.0/package/scripts/service_check.py     |     6 +-
 .../2.1.0.3.0/package/scripts/webhcat_service.py   |    19 +-
 .../KAFKA/0.10.0/configuration/kafka-broker.xml    |    39 +
 .../configuration/kafka_client_jaas_conf.xml       |    43 +
 .../KAFKA/0.10.0/configuration/kafka_jaas_conf.xml |   116 +
 .../KAFKA/0.8.1/configuration/kafka-env.xml        |     2 +-
 .../KAFKA/0.8.1/package/scripts/kafka.py           |     4 +-
 .../KAFKA/0.8.1/package/scripts/params.py          |    16 +-
 .../KAFKA/0.8.1/package/scripts/service_check.py   |    15 +-
 .../0.8.1/package/scripts/setup_ranger_kafka.py    |     8 +-
 .../KAFKA/0.8.1/package/scripts/upgrade.py         |     3 +-
 .../package/templates/kafka_client_jaas.conf.j2    |     3 +
 .../0.8.1/package/templates/kafka_jaas.conf.j2     |    47 +
 .../KAFKA/0.9.0/configuration/kafka-broker.xml     |     2 +-
 .../1.10.3-10/configuration/kerberos-env.xml       |    36 +-
 .../1.10.3-10/package/scripts/kerberos_common.py   |     7 +-
 .../1.10.3-30/configuration/kerberos-env.xml       |    36 +-
 .../1.10.3-30/package/scripts/kerberos_common.py   |     7 +-
 .../common-services/LOGSEARCH/0.5.0/metainfo.xml   |     6 +-
 .../1.0.0.2.3/package/scripts/service_check.py     |     3 +-
 .../OOZIE/4.0.0.2.0/package/scripts/oozie.py       |    38 +-
 .../4.0.0.2.0/package/scripts/params_linux.py      |     5 +-
 .../common-services/OOZIE/4.2.0.2.3/metainfo.xml   |     5 -
 .../common-services/OOZIE/4.2.0.3.0/metainfo.xml   |    14 +-
 .../OOZIE/4.2.0.3.0/package/scripts/oozie.py       |    15 +-
 .../4.2.0.3.0/package/scripts/params_linux.py      |     5 +-
 .../RANGER/0.4.0/package/scripts/ranger_admin.py   |    23 +-
 .../RANGER/0.4.0/package/scripts/ranger_tagsync.py |    23 +-
 .../1.0.0.3.0/package/scripts/ranger_admin.py      |    24 +-
 .../1.0.0.3.0/package/scripts/ranger_tagsync.py    |    23 +-
 .../0.5.0.2.3/configuration/kms-site.xml           |    26 -
 .../0.5.0.2.3/package/scripts/kms_server.py        |    21 +-
 .../1.0.0.3.0/configuration/kms-site.xml           |    26 -
 .../1.0.0.3.0/package/scripts/kms_server.py        |    19 +-
 .../scripts/alerts/alert_spark_thrift_port.py      |     8 +-
 .../SPARK/1.2.1/package/scripts/setup_spark.py     |     3 +-
 .../scripts/alerts/alert_spark2_thrift_port.py     |     8 +-
 .../SPARK2/2.0.0/package/scripts/setup_spark.py    |     3 +-
 .../common-services/SQOOP/1.4.4.2.0/metainfo.xml   |     5 -
 .../1.4.4.2.0/package/scripts/params_linux.py      |     4 +-
 .../common-services/SQOOP/1.4.4.3.0/metainfo.xml   |    10 -
 .../1.4.4.3.0/package/scripts/params_linux.py      |     4 +-
 .../0.9.1/package/scripts/supervisord_service.py   |     1 +
 .../package/scripts/supervisord_service.py         |     1 +
 .../SUPERSET/0.15.0/themes/theme.json              |    22 +-
 .../TEZ/0.4.0.2.1/package/scripts/params_linux.py  |     2 +-
 .../TEZ/0.4.0.2.1/package/scripts/tez.py           |     5 +-
 .../TEZ/0.9.0.3.0/configuration/tez-site.xml       |     4 +-
 .../TEZ/0.9.0.3.0/package/scripts/params_linux.py  |     2 +-
 .../TEZ/0.9.0.3.0/package/scripts/tez.py           |     4 +
 .../2.1.0.2.0/configuration-mapred/mapred-site.xml |     2 +-
 .../YARN/2.1.0.2.0/package/scripts/params_linux.py |    42 +-
 .../2.1.0.2.0/package/scripts/status_params.py     |    52 +-
 .../YARN/2.1.0.2.0/package/scripts/yarn.py         |     3 +
 .../3.0.0.3.0/configuration-mapred/mapred-site.xml |     2 +-
 .../YARN/3.0.0.3.0/configuration/yarn-site.xml     |     2 +-
 .../YARN/3.0.0.3.0/package/scripts/params_linux.py |    59 +-
 .../3.0.0.3.0/package/scripts/status_params.py     |    52 +-
 .../YARN/3.0.0.3.0/package/scripts/yarn.py         |     3 +
 .../YARN/3.0.0.3.0/service_advisor.py              |     3 +-
 .../ZEPPELIN/0.7.0/package/scripts/master.py       |   145 +-
 .../ZEPPELIN/0.7.0/package/scripts/params.py       |    26 +-
 .../common-services/ZOOKEEPER/3.4.5/metainfo.xml   |     1 +
 .../custom_actions/scripts/install_packages.py     |    17 +-
 .../custom_actions/scripts/ru_execute_tasks.py     |     5 +-
 .../stacks/BIGTOP/0.8/services/HIVE/metainfo.xml   |     4 -
 .../stacks/BIGTOP/0.8/services/OOZIE/metainfo.xml  |     4 -
 .../HDP/2.0.6.GlusterFS/services/HIVE/metainfo.xml |     4 -
 .../2.0.6.GlusterFS/services/OOZIE/metainfo.xml    |     4 -
 .../HDP/2.0.6/properties/stack_features.json       |    25 +
 .../HDP/2.0.6/properties/stack_packages.json       |   111 +-
 .../stacks/HDP/2.0.6/role_command_order.json       |     3 +-
 .../stacks/HDP/2.0.6/services/stack_advisor.py     |    35 +
 .../HDP/2.1.GlusterFS/services/HIVE/metainfo.xml   |     4 -
 .../HDP/2.1.GlusterFS/services/OOZIE/metainfo.xml  |     4 -
 .../2.1/services/HIVE/configuration/hive-site.xml  |     2 +-
 .../stacks/HDP/2.1/services/HIVE/metainfo.xml      |     5 -
 .../stacks/HDP/2.2/services/HDFS/metainfo.xml      |    35 -
 .../2.2/services/HIVE/configuration/hive-site.xml  |     2 +-
 .../stacks/HDP/2.2/services/HIVE/metainfo.xml      |    10 -
 .../stacks/HDP/2.2/services/OOZIE/metainfo.xml     |     5 -
 .../stacks/HDP/2.2/services/SQOOP/metainfo.xml     |    10 -
 .../2.2/services/TEZ/configuration/tez-site.xml    |     4 +-
 .../YARN/configuration-mapred/mapred-site.xml      |     2 +-
 .../HDP/2.3.GlusterFS/services/HIVE/metainfo.xml   |     9 -
 .../HDP/2.3.GlusterFS/services/SQOOP/metainfo.xml  |     9 -
 .../src/main/resources/stacks/HDP/2.3/metainfo.xml |     2 +-
 .../stacks/HDP/2.3/services/HDFS/metainfo.xml      |    30 -
 .../stacks/HDP/2.3/services/HIVE/metainfo.xml      |    10 -
 .../stacks/HDP/2.3/upgrades/config-upgrade.xml     |     7 +
 .../HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml    |     4 +
 .../stacks/HDP/2.3/upgrades/upgrade-2.6.xml        |     2 +
 .../stacks/HDP/2.4/upgrades/config-upgrade.xml     |     6 +
 .../HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml    |     4 +
 .../stacks/HDP/2.4/upgrades/upgrade-2.6.xml        |     2 +
 .../stacks/HDP/2.5/services/FALCON/metainfo.xml    |     4 +-
 .../stacks/HDP/2.5/services/HIVE/metainfo.xml      |    10 -
 .../2.5/services/YARN/configuration/yarn-site.xml  |     4 +-
 .../stacks/HDP/2.5/services/YARN/kerberos.json     |    12 +-
 .../stacks/HDP/2.5/services/stack_advisor.py       |     5 +-
 .../stacks/HDP/2.5/upgrades/config-upgrade.xml     |    35 +
 .../HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml    |    31 +-
 .../stacks/HDP/2.5/upgrades/upgrade-2.6.xml        |    50 +-
 .../resources/stacks/HDP/2.6/repos/repoinfo.xml    |     2 +-
 .../ATLAS/configuration/application-properties.xml |    15 +
 .../stacks/HDP/2.6/services/DRUID/kerberos.json    |    45 +-
 .../stacks/HDP/2.6/services/FALCON/metainfo.xml    |    26 +
 .../HIVE/configuration/hive-interactive-site.xml   |   225 +
 .../stacks/HDP/2.6/services/OOZIE/metainfo.xml     |    37 +
 .../configuration/spark2-log4j-properties.xml      |    56 +
 .../services/STORM/configuration/storm-site.xml    |     6 +-
 .../stacks/HDP/2.6/services/SUPERSET/kerberos.json |    10 +-
 .../2.6/services/YARN/configuration/yarn-site.xml  |     2 +-
 .../stacks/HDP/2.6/services/YARN/kerberos.json     |    24 +-
 .../stacks/HDP/2.6/services/stack_advisor.py       |    25 +-
 .../stacks/HDP/2.6/upgrades/config-upgrade.xml     |    67 +-
 .../HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml    |    33 +-
 .../stacks/HDP/2.6/upgrades/upgrade-2.6.xml        |    14 +
 .../stacks/HDP/3.0/configuration/settings.xml      |    91 +
 .../stacks/HDP/3.0/properties/stack_packages.json  |   110 +-
 .../stacks/HDP/3.0/role_command_order.json         |     2 +-
 .../stacks/HDP/3.0/services/HDFS/metainfo.xml      |    30 -
 .../YARN/configuration-mapred/mapred-site.xml      |     2 +-
 .../3.0/services/YARN/configuration/yarn-site.xml  |     4 +-
 .../stacks/PERF/1.0/configuration/cluster-env.xml  |    26 +
 .../resources/stacks/PERF/1.0/hdp_urlinfo.json     |    12 +
 .../PERF/1.0/hooks/before-INSTALL/scripts/hook.py  |     7 +
 .../stacks/PERF/1.0/properties/stack_packages.json |     8 +
 .../resources/stacks/PERF/1.0/repos/repoinfo.xml   |     1 +
 .../services/FAKEYARN/configuration/yarn-site.xml  |     4 +-
 .../KERBEROS/configuration/kerberos-env.xml        |    36 +-
 .../src/main/resources/stacks/PERF/1.0/vdf.xml     |    73 +
 .../resources/stacks/PERF/2.0/hdp_urlinfo.json     |    12 +
 .../resources/stacks/PERF/2.0/repos/repoinfo.xml   |     1 +
 .../src/main/resources/stacks/PERF/2.0/vdf.xml     |    74 +
 .../src/main/resources/stacks/stack_advisor.py     |     9 +
 ambari-server/src/main/resources/upgrade-pack.xsd  |     9 +-
 .../src/main/resources/version_definition.xsd      |    23 +-
 .../actionmanager/ExecutionCommandWrapperTest.java |    21 +-
 .../actionmanager/TestActionDBAccessorImpl.java    |    18 +-
 .../server/actionmanager/TestActionManager.java    |     6 +-
 .../server/actionmanager/TestActionScheduler.java  |   110 +-
 .../TestActionSchedulerThreading.java              |    10 +-
 .../ambari/server/actionmanager/TestStage.java     |     4 +-
 .../server/agent/DummyHeartbeatConstants.java      |     1 +
 .../server/agent/HeartbeatProcessorTest.java       |     8 +-
 .../ambari/server/agent/HeartbeatTestHelper.java   |     3 +-
 .../ambari/server/agent/TestHeartbeatHandler.java  |    11 +-
 .../ambari/server/agent/TestHeartbeatMonitor.java  |    16 +-
 .../alerts/ComponentVersionAlertRunnableTest.java  |     2 +
 .../query/render/ClusterBlueprintRendererTest.java |     4 +-
 .../api/query/render/DefaultRendererTest.java      |     4 +-
 .../api/query/render/MinimalRendererTest.java      |     4 +-
 .../resources/ClusterResourceDefinitionTest.java   |    21 +-
 .../resources/ServiceResourceDefinitionTest.java   |     6 +-
 .../server/api/services/AmbariMetaInfoTest.java    |     2 +-
 .../server/api/services/ComponentServiceTest.java  |     4 +-
 .../api/services/ConfigurationServiceTest.java     |     2 +-
 .../api/services/RootServiceServiceTest.java       |     2 +-
 .../server/api/services/ServiceServiceTest.java    |    10 +-
 .../StackAdvisorBlueprintProcessorTest.java        |    12 +-
 .../commands/StackAdvisorCommandTest.java          |   212 +
 .../server/checks/AbstractCheckDescriptorTest.java |     3 +
 .../server/checks/AutoStartDisabledCheckTest.java  |    12 +-
 .../checks/ClientRetryPropertyCheckTest.java       |     2 +
 .../checks/ComponentExistsInRepoCheckTest.java     |     6 +-
 .../checks/ComponentsInstallationCheckTest.java    |    15 +-
 .../server/checks/ConfigurationMergeCheckTest.java |     2 +
 .../checks/DatabaseConsistencyCheckHelperTest.java |   178 +-
 .../checks/DruidHighAvailabilityCheckTest.java     |     2 +
 .../checks/HiveMultipleMetastoreCheckTest.java     |     3 +
 .../server/checks/HiveNotRollingWarningTest.java   |     3 +
 .../server/checks/HostsHeartbeatCheckTest.java     |     2 +
 .../checks/HostsMasterMaintenanceCheckTest.java    |     5 +-
 .../checks/HostsRepositoryVersionCheckTest.java    |     2 +
 .../server/checks/InstallPackagesCheckTest.java    |     2 +
 .../server/checks/KafkaKerberosCheckTest.java      |     2 +
 .../apache/ambari/server/checks/LZOCheckTest.java  |   152 +
 ...pReduce2JobHistoryStatePreservingCheckTest.java |     2 +
 .../server/checks/RangerAuditDbCheckTest.java      |     3 +
 .../server/checks/RangerPasswordCheckTest.java     |     3 +
 .../server/checks/RangerSSLConfigCheckTest.java    |     3 +
 .../RequiredServicesInRepositoryCheckTest.java     |   115 +
 .../checks/SecondaryNamenodeDeletedCheckTest.java  |     3 +
 .../checks/ServiceCheckValidityCheckTest.java      |    27 +-
 .../checks/ServicesMaintenanceModeCheckTest.java   |     2 +
 ...ServicesMapReduceDistributedCacheCheckTest.java |     3 +
 .../ServicesNamenodeHighAvailabilityCheckTest.java |     3 +
 .../checks/ServicesNamenodeTruncateCheckTest.java  |     2 +
 .../ServicesTezDistributedCacheCheckTest.java      |     3 +
 .../ambari/server/checks/ServicesUpCheckTest.java  |    18 +-
 .../ServicesYarnWorkPreservingCheckTest.java       |     2 +
 .../server/checks/StormShutdownWarningTest.java    |     3 +
 .../server/checks/UpgradeCheckOrderTest.java       |     3 +-
 .../configuration/RecoveryConfigHelperTest.java    |    19 +-
 .../server/controller/ActionRequestTest.java       |     3 +-
 .../server/controller/ActionResponseTest.java      |     4 +-
 .../AmbariCustomCommandExecutionHelperTest.java    |   161 +-
 .../AmbariManagementControllerImplTest.java        |   174 +-
 .../controller/AmbariManagementControllerTest.java |  3085 ++-
 .../ambari/server/controller/AmbariServerTest.java |     3 +
 .../BackgroundCustomCommandExecutionTest.java      |    76 +-
 .../server/controller/ClusterResponseTest.java     |     2 +-
 .../server/controller/KerberosHelperTest.java      |    15 +-
 .../controller/MaintenanceStateHelperTest.java     |    22 +-
 ...reshYarnCapacitySchedulerReleaseConfigTest.java |    90 +-
 .../controller/RootServiceResponseFactoryTest.java |    27 +-
 .../internal/AbstractResourceProviderTest.java     |    57 +-
 .../internal/ActionResourceProviderTest.java       |    12 +-
 .../ActiveWidgetLayoutResourceProviderTest.java    |     4 +
 .../BlueprintConfigurationProcessorTest.java       |    36 +-
 .../internal/BlueprintResourceProviderTest.java    |     5 +-
 .../internal/ClientConfigResourceProviderTest.java |    42 +-
 .../ClusterStackVersionResourceProviderTest.java   |   353 +-
 .../internal/ComponentResourceProviderTest.java    |    65 +-
 .../internal/ConfigGroupResourceProviderTest.java  |    10 +-
 .../HostComponentResourceProviderTest.java         |    36 +-
 .../HostKerberosIdentityResourceProviderTest.java  |    12 +-
 .../internal/HostResourceProviderTest.java         |    32 +-
 .../HostStackVersionResourceProviderTest.java      |    30 +-
 .../controller/internal/JMXHostProviderTest.java   |   196 +-
 .../internal/RepositoryResourceProviderTest.java   |     6 +-
 ...ComponentConfigurationResourceProviderTest.java |   533 +
 .../RootServiceComponentPropertyProviderTest.java  |    15 +-
 .../RootServiceComponentResourceProviderTest.java  |     9 +-
 ...otServiceHostComponentResourceProviderTest.java |     2 +
 .../ServiceDependencyResourceProviderTest.java     |   573 +
 ...ServiceGroupDependencyResourceProviderTest.java |   527 +
 .../internal/ServiceGroupResourceProviderTest.java |    45 +
 .../internal/ServiceResourceProviderTest.java      |    25 +-
 .../internal/StackAdvisorResourceProviderTest.java |    97 +-
 .../StackConfigurationResourceProviderTest.java    |    11 +-
 .../internal/StackDefinedPropertyProviderTest.java |    10 +-
 ...tackLevelConfigurationResourceProviderTest.java |    14 +-
 .../server/controller/internal/StackTest.java      |    17 +-
 .../StackUpgradeConfigurationMergeTest.java        |     6 +-
 .../controller/internal/UnitUpdaterTest.java       |     6 +-
 .../internal/UpgradeResourceProviderTest.java      |    59 +-
 .../UpgradeSummaryResourceProviderTest.java        |     4 +-
 .../UserAuthorizationResourceProviderTest.java     |     6 +-
 .../internal/UserResourceProviderTest.java         |     4 +
 .../internal/ValidationResourceProviderTest.java   |     4 +-
 .../VersionDefinitionResourceProviderTest.java     |     4 +-
 .../logging/LoggingSearchPropertyProviderTest.java |    10 +-
 .../metrics/timeline/AMSPropertyProviderTest.java  |     2 +
 .../utilities/KerberosIdentityCleanerTest.java     |    13 +-
 .../state/GeneralServiceCalculatedStateTest.java   |     4 +-
 .../apache/ambari/server/events/EventsTest.java    |    35 +-
 .../upgrade/HostVersionOutOfSyncListenerTest.java  |    25 +-
 .../server/ldap/LdapModuleFunctionalTest.java      |   153 +
 .../domain/TestAmbariLdapConfigurationFactory.java |    29 +
 .../server/ldap/service/AmbariLdapFacadeTest.java  |   209 +
 .../DefaultLdapAttributeDetectionServiceTest.java  |   181 +
 .../ads/DefaultLdapConfigurationServiceTest.java   |   220 +
 .../ads/detectors/GroupMemberAttrDetectorTest.java |   107 +
 .../server/metadata/AgentAlertDefinitionsTest.java |     6 +-
 .../server/notifications/DispatchFactoryTest.java  |     3 +-
 .../dispatchers/AmbariSNMPDispatcherTest.java      |    23 +-
 .../server/orm/InMemoryDefaultTestModule.java      |     2 +
 .../apache/ambari/server/orm/JdbcPropertyTest.java |     5 +-
 .../apache/ambari/server/orm/OrmTestHelper.java    |    23 +-
 .../org/apache/ambari/server/orm/TestOrmImpl.java  |    14 +-
 .../server/orm/dao/AlertDefinitionDAOTest.java     |     7 +-
 .../server/orm/dao/AlertDispatchDAOTest.java       |    97 +-
 .../ambari/server/orm/dao/AlertsDAOTest.java       |    13 +-
 .../server/orm/dao/AmbariConfigurationDAOTest.java |   298 +
 .../server/orm/dao/ServiceConfigDAOTest.java       |    30 +-
 .../orm/entities/ServiceConfigEntityTest.java      |     2 +-
 ...apAuthenticationProviderForDNWithSpaceTest.java |    35 +-
 .../AmbariLdapAuthenticationProviderTest.java      |     3 +-
 .../authorization/AmbariLocalUserProviderTest.java |     3 +-
 .../authorization/LdapServerPropertiesTest.java    |     5 +-
 .../kerberos/ADKerberosOperationHandlerTest.java   |   261 +-
 .../AbstractPrepareKerberosServerActionTest.java   |    16 +-
 .../ConfigureAmbariIdentitiesServerActionTest.java |    11 +-
 .../kerberos/FinalizeKerberosServerActionTest.java |     5 +
 .../kerberos/IPAKerberosOperationHandlerTest.java  |   147 +-
 .../kerberos/KDCKerberosOperationHandlerTest.java  |   168 +
 .../kerberos/KerberosIdentityDataFileTest.java     |     8 +-
 .../kerberos/KerberosOperationHandlerTest.java     |   152 +-
 .../kerberos/KerberosServerActionTest.java         |   137 +-
 .../kerberos/MITKerberosOperationHandlerTest.java  |   633 +-
 .../AtlasProxyUserConfigCalculationTest.java       |   127 +
 .../upgrades/ComponentVersionCheckActionTest.java  |    43 +-
 .../serveraction/upgrades/ConfigureActionTest.java |    22 +-
 .../upgrades/CreateAndConfigureActionTest.java     |   352 +
 .../upgrades/PreconfigureKerberosActionTest.java   |    12 +-
 .../serveraction/upgrades/UpgradeActionTest.java   |    65 +-
 .../ambari/server/stack/ServiceModuleTest.java     |    40 +-
 .../stack/StackManagerCommonServicesTest.java      |    24 +-
 .../server/stack/StackManagerExtensionTest.java    |    28 +-
 .../ambari/server/stack/StackManagerTest.java      |    28 +-
 .../server/stageplanner/TestStagePlanner.java      |    70 +-
 .../ambari/server/state/CheckHelperTest.java       |     7 +
 .../ambari/server/state/ConfigGroupTest.java       |     3 +-
 .../ambari/server/state/ConfigHelperTest.java      |    66 +-
 .../ambari/server/state/DesiredConfigTest.java     |     4 +-
 .../ambari/server/state/ServiceComponentTest.java  |    58 +-
 .../apache/ambari/server/state/ServiceTest.java    |    25 +-
 .../ambari/server/state/UpgradeContextTest.java    |    38 +-
 .../ambari/server/state/UpgradeHelperTest.java     |    50 +-
 .../state/alerts/AlertEventPublisherTest.java      |    31 +-
 .../state/alerts/AlertReceivedListenerTest.java    |    16 +-
 .../state/alerts/AlertStateChangedEventTest.java   |     4 +-
 .../server/state/alerts/InitialAlertEventTest.java |    29 +-
 .../server/state/cluster/ClusterDeadlockTest.java  |    33 +-
 .../server/state/cluster/ClusterImplTest.java      |     6 +-
 .../ambari/server/state/cluster/ClusterTest.java   |   242 +-
 .../server/state/cluster/ClustersDeadlockTest.java |    63 +-
 .../ambari/server/state/cluster/ClustersTest.java  |    22 +-
 .../ConcurrentServiceConfigVersionTest.java        |    20 +-
 ...ceComponentHostConcurrentWriteDeadlockTest.java |    16 +-
 .../state/repository/VersionDefinitionTest.java    |    77 +-
 .../services/AlertNoticeDispatchServiceTest.java   |    53 +-
 .../state/stack/ConfigUpgradeValidityTest.java     |    10 +
 .../stack/upgrade/RepositoryVersionHelperTest.java |     2 +-
 .../svccomphost/ServiceComponentHostTest.java      |    75 +-
 .../server/testing/DBInconsistencyTests.java       |     8 +-
 .../ambari/server/topology/AmbariContextTest.java  |    46 +-
 .../ambari/server/topology/BlueprintImplTest.java  |    97 +-
 .../topology/BlueprintValidatorImplTest.java       |    10 +-
 .../server/topology/ClusterTopologyImplTest.java   |    40 +-
 .../topology/validators/BlueprintImplV2Test.java   |    79 -
 .../validators/HiveServiceValidatorTest.java       |     2 +-
 .../RequiredConfigPropertiesValidatorTest.java     |     2 +-
 .../validators/StackConfigTypeValidatorTest.java   |    29 +-
 .../topology/validators/UnitValidatorTest.java     |     6 +-
 .../server/upgrade/AbstractUpgradeCatalogTest.java |    23 +-
 .../server/upgrade/UpgradeCatalog252Test.java      |    19 +-
 .../server/upgrade/UpgradeCatalog260Test.java      |   171 +-
 .../server/upgrade/UpgradeCatalog300Test.java      |   233 +-
 .../apache/ambari/server/utils/StageUtilsTest.java |     2 +
 .../ambari/server/utils/TestVersionUtils.java      |     4 +
 .../ambari/server/view/ViewRegistryTest.java       |     2 +-
 ambari-server/src/test/python/TestAmbariServer.py  |    11 +-
 ambari-server/src/test/python/TestSettings.py      |   216 +
 .../configs/install_packages_config.json           |     1 +
 .../configs/install_packages_repository_file.json  |     1 +
 .../python/custom_actions/test_ru_execute_tasks.py |     6 +-
 .../stacks/2.0.6/HIVE/test_hive_metastore.py       |     8 +-
 .../python/stacks/2.0.6/HIVE/test_hive_server.py   |    18 +-
 .../stacks/2.0.6/HIVE/test_hive_service_check.py   |     2 +-
 .../stacks/2.0.6/HIVE/test_webhcat_server.py       |     4 -
 .../stacks/2.0.6/common/test_stack_advisor.py      |    59 +-
 .../stacks/2.0.6/configs/repository_file.json      |     1 +
 .../python/stacks/2.1/FALCON/test_falcon_server.py |    16 +-
 .../python/stacks/2.1/HIVE/test_hive_metastore.py  |     9 +-
 .../test/python/stacks/2.1/TEZ/test_tez_client.py  |     2 +-
 .../stacks/2.2/SPARK/test_job_history_server.py    |    12 +-
 .../python/stacks/2.2/SPARK/test_spark_client.py   |    12 +-
 .../python/stacks/2.2/common/test_conf_select.py   |    14 +-
 .../python/stacks/2.2/configs/oozie-upgrade.json   |     3 +-
 .../stacks/2.3/MAHOUT/test_mahout_service_check.py |     4 +-
 .../stacks/2.3/SPARK/test_spark_thrift_server.py   |     6 +-
 .../HIVE/running_withMOTDmsg_andTrailingMsg.txt    |    46 +
 .../python/stacks/2.5/HIVE/test_hive_server_int.py |    52 +-
 .../python/stacks/2.5/common/test_stack_advisor.py |     7 +-
 .../stacks/2.5/configs/ranger-admin-secured.json   |     2 -
 .../stacks/2.5/configs/ranger-kms-secured.json     |     2 -
 .../2.6/KAFKA/test_kafka_broker_other_sasl.py      |    97 +
 .../stacks/2.6/ZEPPELIN/test_zeppelin_070.py       |   111 +-
 .../python/stacks/2.6/common/test_stack_advisor.py |    43 +-
 .../2.6/configs/default_kafka_plaintext.json       |   631 +
 .../2.6/configs/default_kafka_plaintextsasl.json   |   631 +
 .../2.6/configs/default_kafka_sasl_plaintext.json  |   631 +
 .../stacks/2.6/configs/default_kafka_sasl_ssl.json |   631 +
 .../stacks/2.6/configs/ranger-admin-secured.json   |     2 -
 .../PreconfigureActionTest_cluster_config.json     |     4 +-
 .../test/resources/blueprintv2/blueprintv2.json    |   146 -
 .../{main => test}/resources/cluster-settings.xml  |     0
 .../test/resources/extensions/EXT/0.2/metainfo.xml |     4 +-
 .../test/resources/extensions/EXT/0.4/metainfo.xml |    32 +
 .../EXT/{0.3 => 0.4}/services/OOZIE2/metainfo.xml  |     0
 .../services/OOZIE2/themes/broken_theme.json       |     0
 .../test_kerberos_descriptor_ranger_kms.json       |   286 +
 .../src/test/resources/stacks/HDP/0.1/metainfo.xml |    10 +
 .../test/resources/stacks/HDP/2.0.1/metainfo.xml   |    18 +
 .../stacks/HDP/2.0.1/services/HIVE/metainfo.xml    |     8 -
 .../HDP/0.1/metainfo.xml                           |    10 +
 .../resources/version_definition_with_tags.xml     |    86 +
 ambari-utility/pom.xml                             |     6 +
 ambari-web/app/app.js                              |    24 +-
 ambari-web/app/assets/test/tests.js                |     3 +
 ambari-web/app/config.js                           |     1 -
 .../app/controllers/global/update_controller.js    |     2 +-
 ambari-web/app/controllers/installer.js            |    60 +-
 .../main/admin/kerberos/step1_controller.js        |    52 +-
 .../main/admin/kerberos/step2_controller.js        |     2 +-
 .../main/admin/stack_and_upgrade_controller.js     |     4 +-
 .../main/dashboard/config_history_controller.js    |    92 +-
 .../main/host/bulk_operations_controller.js        |    14 +-
 ambari-web/app/controllers/main/service/item.js    |    13 +-
 .../main/service/reassign/step3_controller.js      |    21 +-
 .../main/service/reassign/step4_controller.js      |    12 +-
 .../app/controllers/wizard/step8_controller.js     |    12 +-
 ambari-web/app/mappers/components_state_mapper.js  |     1 +
 .../app/mappers/repository_version_mapper.js       |     3 +-
 ambari-web/app/mappers/stack_mapper.js             |     3 +-
 ambari-web/app/messages.js                         |    32 +-
 ambari-web/app/mixins/common/serverValidator.js    |    41 +-
 .../mixins/main/host/details/actions/check_host.js |     8 +-
 ambari-web/app/mixins/wizard/addSecurityConfigs.js |     7 +
 .../app/mixins/wizard/assign_master_components.js  |     2 +-
 ambari-web/app/models/alerts/alert_definition.js   |    18 +-
 ambari-web/app/models/alerts/alert_group.js        |     2 +-
 ambari-web/app/models/client_component.js          |     1 +
 .../app/models/configs/service_config_version.js   |     9 +-
 ambari-web/app/models/host_stack_version.js        |     4 +-
 ambari-web/app/models/repository.js                |    17 +
 ambari-web/app/models/stack_version/repository.js  |     3 +-
 ambari-web/app/routes/installer.js                 |     3 +-
 ambari-web/app/routes/main.js                      |     2 +-
 ambari-web/app/styles/application.less             |    17 +-
 ambari-web/app/styles/common.less                  |     2 +-
 ambari-web/app/styles/dashboard.less               |     6 +-
 ambari-web/app/styles/hosts.less                   |    89 +-
 ambari-web/app/styles/theme/bootstrap-ambari.css   |    16 +-
 ambari-web/app/styles/visualsearch.less            |   100 +
 ambari-web/app/styles/wizard.less                  |    22 +
 .../common/configs/config_history_flow.hbs         |     8 +-
 .../common/configs/service_version_box.hbs         |     8 +-
 .../app/templates/common/host_progress_popup.hbs   |     6 +-
 .../modal_popups/config_recommendation_popup.hbs   |   102 +-
 .../common/modal_popups/widget_browser_popup.hbs   |     6 +-
 ambari-web/app/templates/experimental.hbs          |     6 +-
 ambari-web/app/templates/installer.hbs             |     2 +-
 .../main/admin/stack_upgrade/versions.hbs          |     6 +-
 ambari-web/app/templates/main/alerts.hbs           |    22 +-
 .../alert_definition/alert_definition_summary.hbs  |     2 +-
 .../main/alerts/alert_definitions_actions.hbs      |     2 +-
 ambari-web/app/templates/main/dashboard.hbs        |     2 +-
 .../templates/main/dashboard/config_history.hbs    |    25 +-
 ambari-web/app/templates/main/host.hbs             |    32 +-
 .../templates/main/host/bulk_operation_menu.hbs    |   134 +-
 .../app/templates/main/host/combo_search_box.hbs   |     9 +-
 .../templates/main/host/details/host_component.hbs |   176 +-
 .../app/templates/main/host/stack_versions.hbs     |     4 +-
 ambari-web/app/templates/main/host/summary.hbs     |   120 +-
 .../app/templates/main/service/reassign/step3.hbs  |     6 +-
 .../app/templates/main/service/services/hdfs.hbs   |   116 +-
 .../app/templates/main/service/services/yarn.hbs   |   184 +-
 ambari-web/app/templates/wizard/step1.hbs          |    36 +
 ambari-web/app/utils/ajax/ajax.js                  |     4 +
 ambari-web/app/utils/helper.js                     |    23 +
 ambari-web/app/views.js                            |     3 +
 ambari-web/app/views/common/controls_view.js       |     9 +-
 .../config_validation/config_validation_popup.js   |     7 +-
 ambari-web/app/views/common/search_box_view.js     |   165 +
 ambari-web/app/views/common/table_view.js          |    11 +
 .../stack_upgrade/upgrade_version_box_view.js      |     4 +-
 .../stack_upgrade/upgrade_version_column_view.js   |     1 -
 .../app/views/main/alert_definitions_view.js       |   264 -
 .../alert_definition/alert_definition_summary.js   |     2 +-
 .../app/views/main/alerts/alert_search_box.js      |   195 +
 .../main/dashboard/config_history_search_box.js    |   221 +
 .../views/main/dashboard/config_history_view.js    |   101 -
 ambari-web/app/views/main/host/combo_search_box.js |    36 +-
 .../app/views/main/host/hosts_table_menu_view.js   |     4 +-
 .../app/views/main/host/stack_versions_view.js     |     2 +-
 ambari-web/app/views/main/service/item.js          |     2 +-
 ambari-web/app/views/main/service/services/yarn.js |    21 +-
 ambari-web/test/controllers/installer_test.js      |    14 +-
 .../main/admin/kerberos/step1_controller_test.js   |    17 -
 .../main/admin/kerberos/step2_controller_test.js   |     2 +-
 .../test/controllers/main/service/item_test.js     |    49 +-
 .../main/service/reassign/step4_controller_test.js |     9 +-
 ambari-web/test/init_test.js                       |     8 +
 .../test/mixins/common/serverValidator_test.js     |    15 +-
 .../mixins/wizard/assign_master_components_test.js |     2 +-
 ambari-web/test/models/alerts/alert_group_test.js  |     5 +-
 ambari-web/test/utils/date/timezone_test.js        |     2 +-
 ambari-web/test/views/common/controls_view_test.js |     2 +-
 .../test/views/common/search_box_view_test.js      |   240 +
 .../test/views/main/alert_definitions_view_test.js |   152 -
 .../views/main/alerts/alert_search_box_test.js     |   168 +
 .../dashboard/config_history_search_box_test.js    |   207 +
 .../main/dashboard/config_history_view_test.js     |   188 +-
 .../test/views/main/host/combo_search_box_test.js  |    66 +-
 ambari-web/test/views/main/service/item_test.js    |     6 +-
 .../test/views/main/service/services/yarn_test.js  |    22 -
 .../vendor/scripts/theme/bootstrap-ambari.js       |    37 +-
 .../stacks/ODPi/2.0/services/HIVE/metainfo.xml     |    10 -
 contrib/utils/perf/deploy-gce-perf-cluster.py      |     1 +
 contrib/version-builder/version_builder.py         |    13 +-
 .../resources/ui/app/components/upload-file.js     |    38 +-
 .../views/files/src/main/resources/ui/bower.json   |     4 +-
 .../src/main/resources/ui/hive-web/bower.json      |     4 +-
 .../view/hive20/resources/browser/DDLProxy.java    |   154 +-
 .../hive20/resources/uploads/UploadService.java    |    12 +-
 .../uploads/query/InsertFromQueryInput.java        |    13 +-
 .../databases/database/tables/upload-table.js      |    12 +
 contrib/views/storm/pom.xml                        |   103 +-
 contrib/views/storm/src/main/resources/index.html  |    45 -
 .../js/backbone-paginator.min.js                   |  1325 --
 .../main/resources/libs/Backbone/js/Backbone.js    |  1920 --
 .../libs/Bootstrap/css/bootstrap-editable.css      |   663 -
 .../libs/Bootstrap/css/bootstrap-slider.min.css    |    28 -
 .../libs/Bootstrap/css/bootstrap-switch.min.css    |    22 -
 .../resources/libs/Bootstrap/css/bootstrap.css     |  5959 ------
 .../fonts/glyphicons-halflings-regular.svg         |   288 -
 .../main/resources/libs/Bootstrap/images/clear.png |   Bin 509 -> 0 bytes
 .../resources/libs/Bootstrap/images/loading.gif    |   Bin 1849 -> 0 bytes
 .../libs/Bootstrap/js/bootstrap-editable.min.js    |     7 -
 .../libs/Bootstrap/js/bootstrap-notify.min.js      |     1 -
 .../libs/Bootstrap/js/bootstrap-slider.min.js      |    29 -
 .../libs/Bootstrap/js/bootstrap-switch.min.js      |    22 -
 .../resources/libs/Bootstrap/js/bootstrap.min.js   |     7 -
 .../libs/Font-Awesome/css/font-awesome.min.css     |     4 -
 .../libs/Font-Awesome/fonts/FontAwesome.otf        |   Bin 109688 -> 0 bytes
 .../Font-Awesome/fonts/fontawesome-webfont.eot     |   Bin 70807 -> 0 bytes
 .../Font-Awesome/fonts/fontawesome-webfont.svg     |   655 -
 .../Font-Awesome/fonts/fontawesome-webfont.ttf     |   Bin 142072 -> 0 bytes
 .../Font-Awesome/fonts/fontawesome-webfont.woff    |   Bin 83588 -> 0 bytes
 .../Font-Awesome/fonts/fontawesome-webfont.woff2   |   Bin 66624 -> 0 bytes
 .../resources/libs/Underscore/js/Underscore.js     |  1548 --
 .../main/resources/libs/bootbox/js/bootbox.min.js  |     6 -
 .../src/main/resources/libs/d3/js/d3-tip.min.js    |     1 -
 .../storm/src/main/resources/libs/d3/js/d3.min.js  |     5 -
 .../main/resources/libs/dagre-d3/dagre-d3.min.js   |    28 -
 .../resources/libs/jQuery/js/jquery-2.2.3.min.js   |     4 -
 .../src/main/resources/libs/jsx/JSXTransformer.js  | 15201 --------------
 .../views/storm/src/main/resources/libs/jsx/jsx.js |    75 -
 .../src/main/resources/libs/react/js/react-dom.js  |    42 -
 .../resources/libs/react/js/react-with-addons.js   | 20775 -------------------
 .../resources/libs/require-js/js/require.min.js    |    36 -
 .../main/resources/libs/require-text/js/text.js    |   390 -
 .../scripts/collections/BaseCollection.js          |   197 -
 .../scripts/collections/VNimbusConfigList.js       |    52 -
 .../resources/scripts/collections/VNimbusList.js   |    52 -
 .../scripts/collections/VSupervisorList.js         |    52 -
 .../scripts/collections/VTopologyConfigList.js     |    49 -
 .../resources/scripts/collections/VTopologyList.js |    52 -
 .../main/resources/scripts/components/BarChart.jsx |   402 -
 .../resources/scripts/components/Breadcrumbs.jsx   |    50 -
 .../main/resources/scripts/components/Modal.jsx    |    60 -
 .../resources/scripts/components/RadialChart.jsx   |   127 -
 .../resources/scripts/components/SearchLogs.jsx    |    89 -
 .../main/resources/scripts/components/Table.jsx    |   101 -
 .../resources/scripts/components/TopologyGraph.jsx |   199 -
 .../scripts/containers/ClusterSummary.jsx          |   122 -
 .../scripts/containers/NimbusConfigSummary.jsx     |   103 -
 .../resources/scripts/containers/NimbusSummary.jsx |   139 -
 .../scripts/containers/SupervisorSummary.jsx       |   155 -
 .../scripts/containers/TopologyConfiguration.jsx   |    93 -
 .../scripts/containers/TopologyDetailGraph.jsx     |    66 -
 .../scripts/containers/TopologyListing.jsx         |   188 -
 .../views/storm/src/main/resources/scripts/main.js |    98 -
 .../src/main/resources/scripts/models/BaseModel.js |    83 -
 .../src/main/resources/scripts/models/VCluster.js  |    42 -
 .../src/main/resources/scripts/models/VNimbus.js   |    42 -
 .../main/resources/scripts/models/VNimbusConfig.js |    42 -
 .../main/resources/scripts/models/VSupervisor.js   |    42 -
 .../src/main/resources/scripts/models/VTopology.js |    90 -
 .../resources/scripts/models/VTopologyConfig.js    |    34 -
 .../scripts/modules/Table/PageableTable.jsx        |    47 -
 .../resources/scripts/modules/Table/Pagination.jsx |   161 -
 .../src/main/resources/scripts/router/Router.js    |   123 -
 .../src/main/resources/scripts/utils/Globals.js    |    30 -
 .../src/main/resources/scripts/utils/Overrides.js  |    30 -
 .../src/main/resources/scripts/utils/Utils.js      |   113 -
 .../scripts/views/ComponentDetailView.jsx          |   534 -
 .../src/main/resources/scripts/views/Dashboard.jsx |    65 -
 .../src/main/resources/scripts/views/Footer.jsx    |    48 -
 .../resources/scripts/views/NimbusSummaryView.jsx  |    65 -
 .../main/resources/scripts/views/ProfilingView.jsx |   214 -
 .../main/resources/scripts/views/RebalanceView.jsx |   223 -
 .../scripts/views/SupervisorSummaryView.jsx        |    65 -
 .../resources/scripts/views/TopologyDetailView.jsx |  1039 -
 .../scripts/views/TopologyListingView.jsx          |    65 -
 .../storm/src/main/resources/styles/style.css      |   579 -
 contrib/views/storm/src/main/resources/ui/.babelrc |    25 +
 .../storm/src/main/resources/ui/.eslintignore.js   |     3 +
 .../views/storm/src/main/resources/ui/.eslintrc.js |    58 +
 .../storm/src/main/resources/ui/app/scripts/app.js |    40 +
 .../ui/app/scripts/components/BarChart.jsx         |   429 +
 .../ui/app/scripts/components/Breadcrumbs.jsx      |    45 +
 .../ui/app/scripts/components/CommonExpanded.jsx   |    30 +
 .../app/scripts/components/CommonNotification.jsx  |    69 +
 .../ui/app/scripts/components/CommonPagination.jsx |    56 +
 .../scripts/components/CommonSwitchComponent.jsx   |    41 +
 .../app/scripts/components/CommonWindowPanel.jsx   |    99 +
 .../scripts/components/CustomToastContainer.jsx    |    41 +
 .../ui/app/scripts/components/Editable.jsx         |   127 +
 .../ui/app/scripts/components/FSModel.jsx          |   149 +
 .../ui/app/scripts/components/FSReactToastr.jsx    |    37 +
 .../resources/ui/app/scripts/components/Footer.jsx |    28 +
 .../app/scripts/components/LogLevelComponent.jsx   |   236 +
 .../ui/app/scripts/components/ProfilingView.jsx    |   168 +
 .../ui/app/scripts/components/RadialChart.jsx      |   134 +
 .../app/scripts/components/RebalanceTopology.jsx   |   152 +
 .../ui/app/scripts/components/SearchLogs.jsx       |    84 +
 .../ui/app/scripts/components/TopologyGraph.jsx    |   208 +
 .../ui/app/scripts/containers/BaseContainer.jsx    |    50 +
 .../ui/app/scripts/containers/ClusterSummary.jsx   |   125 +
 .../app/scripts/containers/ComponentDetailView.jsx |   714 +
 .../ui/app/scripts/containers/Dashboard.jsx        |    52 +
 .../app/scripts/containers/NimbusConfigSummary.jsx |   126 +
 .../ui/app/scripts/containers/NimbusSummary.jsx    |   150 +
 .../app/scripts/containers/SupervisorSummary.jsx   |   165 +
 .../app/scripts/containers/TopologyDetailView.jsx  |   862 +
 .../ui/app/scripts/containers/TopologyListing.jsx  |   222 +
 .../src/main/resources/ui/app/scripts/main.js      |    46 +
 .../resources/ui/app/scripts/rest/TopologyREST.js  |   118 +
 .../resources/ui/app/scripts/routers/routes.jsx    |    68 +
 .../resources/ui/app/scripts/utils/Constants.js    |    45 +
 .../main/resources/ui/app/scripts/utils/Utils.js   |    51 +
 .../main/resources/ui/app/styles/css/bootstrap.css |  6757 ++++++
 .../ui/app/styles/css/font-awesome.min.css         |     4 +
 .../src/main/resources/ui/app/styles/css/style.css |   836 +
 .../resources/ui/app/styles/css/toastr.min.css     |     1 +
 .../ui/app/styles/fonts/fontawesome-webfont.eot    |   Bin 0 -> 76518 bytes
 .../ui/app/styles/fonts/fontawesome-webfont.svg    |   685 +
 .../ui/app/styles/fonts/fontawesome-webfont.ttf    |   Bin 0 -> 152796 bytes
 .../ui/app/styles/fonts/fontawesome-webfont.woff   |   Bin 0 -> 90412 bytes
 .../ui/app/styles/fonts/fontawesome-webfont.woff2  |   Bin 0 -> 71896 bytes
 .../styles}/fonts/glyphicons-halflings-regular.eot |   Bin
 .../styles/fonts/glyphicons-halflings-regular.svg  |   288 +
 .../styles}/fonts/glyphicons-halflings-regular.ttf |   Bin
 .../fonts/glyphicons-halflings-regular.woff        |   Bin
 .../fonts/glyphicons-halflings-regular.woff2       |   Bin
 .../{images => ui/app/styles/img}/icon-bolt.png    |   Bin
 .../{images => ui/app/styles/img}/icon-spout.png   |   Bin
 .../{images => ui/app/styles/img}/loader.gif       |   Bin
 .../resources/ui/config/webpack.config.base.js     |   101 +
 .../ui/config/webpack.config.development.js        |    64 +
 .../ui/config/webpack.config.production.js         |   131 +
 .../storm/src/main/resources/ui/dev-server.js      |   101 +
 .../views/storm/src/main/resources/ui/index.html   |    47 +
 .../views/storm/src/main/resources/ui/package.json |   110 +
 .../org/apache/ambari/view/utils/hdfs/HdfsApi.java |    16 +-
 .../apache/ambari/view/utils/hdfs/HdfsUtil.java    |    17 +-
 .../resources/ui/app/domain/workflow-importer.js   |     3 +-
 docs/pom.xml                                       |    83 +-
 pom.xml                                            |     7 +-
 1436 files changed, 66485 insertions(+), 80253 deletions(-)
 copy {ambari-web/vendor/theme => ambari-admin/src/main/resources/ui/admin-web/app/assets}/fonts/Roboto-Regular-webfont.eot (100%)
 copy {ambari-web/vendor/theme => ambari-admin/src/main/resources/ui/admin-web/app/assets}/fonts/Roboto-Regular-webfont.svg (100%)
 copy {ambari-web/vendor/theme => ambari-admin/src/main/resources/ui/admin-web/app/assets}/fonts/Roboto-Regular-webfont.ttf (100%)
 copy {ambari-web/vendor/theme => ambari-admin/src/main/resources/ui/admin-web/app/assets}/fonts/Roboto-Regular-webfont.woff (100%)
 create mode 100644 ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/AppCtrl.js
 delete mode 100644 ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/NavbarCtrl.js
 create mode 100644 ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/SideNavCtrl.js
 create mode 100644 ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/clusters/ClusterInformationCtrl.js
 delete mode 100644 ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/clusters/ClustersManageAccessCtrl.js
 delete mode 100644 ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/clusters/ExportBlueprintCtrl.js
 delete mode 100644 ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/clusters/UserAccessListCtrl.js
 delete mode 100644 ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/groups/GroupsCreateCtrl.js
 delete mode 100644 ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/groups/GroupsEditCtrl.js
 delete mode 100644 ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/groups/GroupsListCtrl.js
 delete mode 100644 ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/mainCtrl.js
 create mode 100644 ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/userManagement/GroupCreateCtrl.js
 create mode 100644 ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/userManagement/GroupEditCtrl.js
 create mode 100644 ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/userManagement/GroupsListCtrl.js
 create mode 100644 ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/userManagement/UserCreateCtrl.js
 create mode 100644 ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/userManagement/UserEditCtrl.js
 create mode 100644 ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/userManagement/UserManagementCtrl.js
 create mode 100644 ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/userManagement/UsersListCtrl.js
 delete mode 100644 ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/users/UsersCreateCtrl.js
 delete mode 100644 ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/users/UsersListCtrl.js
 delete mode 100644 ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/users/UsersShowCtrl.js
 delete mode 100644 ambari-admin/src/main/resources/ui/admin-web/app/scripts/services/GroupConstants.js
 create mode 100644 ambari-admin/src/main/resources/ui/admin-web/app/scripts/theme/bootstrap-ambari.js
 create mode 100644 ambari-admin/src/main/resources/ui/admin-web/app/styles/cluster-information.css
 create mode 100644 ambari-admin/src/main/resources/ui/admin-web/app/styles/theme/bootstrap-ambari.css
 create mode 100644 ambari-admin/src/main/resources/ui/admin-web/app/styles/toggle-switch.css
 create mode 100644 ambari-admin/src/main/resources/ui/admin-web/app/styles/top-nav.css
 create mode 100644 ambari-admin/src/main/resources/ui/admin-web/app/styles/user-management.css
 create mode 100644 ambari-admin/src/main/resources/ui/admin-web/app/styles/views.css
 delete mode 100644 ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/create.html
 delete mode 100644 ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/listTable.html
 delete mode 100644 ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/listUrls.html
 delete mode 100644 ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/modals/edit.html
 create mode 100644 ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/viewsList.html
 create mode 100644 ambari-admin/src/main/resources/ui/admin-web/app/views/clusters/clusterInformation.html
 delete mode 100644 ambari-admin/src/main/resources/ui/admin-web/app/views/clusters/exportBlueprint.html
 delete mode 100644 ambari-admin/src/main/resources/ui/admin-web/app/views/clusters/manageAccess.html
 delete mode 100644 ambari-admin/src/main/resources/ui/admin-web/app/views/clusters/userAccessList.html
 delete mode 100644 ambari-admin/src/main/resources/ui/admin-web/app/views/groups/create.html
 delete mode 100644 ambari-admin/src/main/resources/ui/admin-web/app/views/groups/edit.html
 delete mode 100644 ambari-admin/src/main/resources/ui/admin-web/app/views/groups/list.html
 delete mode 100644 ambari-admin/src/main/resources/ui/admin-web/app/views/leftNavbar.html
 delete mode 100644 ambari-admin/src/main/resources/ui/admin-web/app/views/main.html
 create mode 100644 ambari-admin/src/main/resources/ui/admin-web/app/views/sideNav.html
 create mode 100644 ambari-admin/src/main/resources/ui/admin-web/app/views/userManagement/groupEdit.html
 create mode 100644 ambari-admin/src/main/resources/ui/admin-web/app/views/userManagement/groupsList.html
 create mode 100644 ambari-admin/src/main/resources/ui/admin-web/app/views/userManagement/main.html
 rename ambari-admin/src/main/resources/ui/admin-web/app/views/{users => userManagement}/modals/changePassword.html (100%)
 create mode 100644 ambari-admin/src/main/resources/ui/admin-web/app/views/userManagement/modals/groupCreate.html
 create mode 100644 ambari-admin/src/main/resources/ui/admin-web/app/views/userManagement/modals/userCreate.html
 create mode 100644 ambari-admin/src/main/resources/ui/admin-web/app/views/userManagement/userEdit.html
 create mode 100644 ambari-admin/src/main/resources/ui/admin-web/app/views/userManagement/usersList.html
 delete mode 100644 ambari-admin/src/main/resources/ui/admin-web/app/views/users/create.html
 delete mode 100644 ambari-admin/src/main/resources/ui/admin-web/app/views/users/list.html
 delete mode 100644 ambari-admin/src/main/resources/ui/admin-web/app/views/users/show.html
 create mode 100644 ambari-admin/src/main/resources/ui/admin-web/test/unit/controllers/AppCtrl_test.js
 create mode 100644 ambari-admin/src/main/resources/ui/admin-web/test/unit/controllers/ClusterInformationCtrl_test.js
 delete mode 100644 ambari-admin/src/main/resources/ui/admin-web/test/unit/controllers/CreateViewInstanceCtrl.js
 delete mode 100644 ambari-admin/src/main/resources/ui/admin-web/test/unit/controllers/clusters/UserAccessListCtrl_test.js
 delete mode 100644 ambari-admin/src/main/resources/ui/admin-web/test/unit/controllers/groups/GroupsListCtrl_test.js
 delete mode 100644 ambari-admin/src/main/resources/ui/admin-web/test/unit/controllers/mainCtrl_test.js
 create mode 100644 ambari-admin/src/main/resources/ui/admin-web/test/unit/controllers/userManagement/GroupsListCtrl_test.js
 create mode 100644 ambari-admin/src/main/resources/ui/admin-web/test/unit/controllers/userManagement/UsersListCtrl_test.js
 delete mode 100644 ambari-admin/src/main/resources/ui/admin-web/test/unit/controllers/users/UsersListCtrl_test.js
 create mode 100644 ambari-common/src/main/python/resource_management/libraries/functions/cluster_settings.py
 delete mode 100644 ambari-common/src/main/python/resource_management/libraries/functions/get_lzo_packages.py
 create mode 100644 ambari-common/src/main/python/resource_management/libraries/functions/lzo_utils.py
 create mode 100644 ambari-common/src/main/python/resource_management/libraries/functions/settings.py
 create mode 100644 ambari-common/src/main/python/resource_management/libraries/functions/stack_settings.py
 create mode 100644 ambari-infra/ambari-infra-manager/src/main/java/org/apache/ambari/infra/job/archive/CompositeFileAction.java
 create mode 100644 ambari-infra/ambari-infra-manager/src/main/java/org/apache/ambari/infra/job/archive/Document.java
 create mode 100644 ambari-infra/ambari-infra-manager/src/main/java/org/apache/ambari/infra/job/archive/DocumentDestination.java
 create mode 100644 ambari-infra/ambari-infra-manager/src/main/java/org/apache/ambari/infra/job/archive/DocumentExportConfiguration.java
 create mode 100644 ambari-infra/ambari-infra-manager/src/main/java/org/apache/ambari/infra/job/archive/DocumentExportJobListener.java
 create mode 100644 ambari-infra/ambari-infra-manager/src/main/java/org/apache/ambari/infra/job/archive/DocumentExportProperties.java
 create mode 100644 ambari-infra/ambari-infra-manager/src/main/java/org/apache/ambari/infra/job/archive/DocumentExportStepListener.java
 create mode 100644 ambari-infra/ambari-infra-manager/src/main/java/org/apache/ambari/infra/job/archive/DocumentExporter.java
 create mode 100644 ambari-infra/ambari-infra-manager/src/main/java/org/apache/ambari/infra/job/archive/DocumentItemReader.java
 create mode 100644 ambari-infra/ambari-infra-manager/src/main/java/org/apache/ambari/infra/job/archive/DocumentItemWriter.java
 create mode 100644 ambari-infra/ambari-infra-manager/src/main/java/org/apache/ambari/infra/job/archive/DocumentIterator.java
 create mode 100644 ambari-infra/ambari-infra-manager/src/main/java/org/apache/ambari/infra/job/archive/DocumentSource.java
 create mode 100644 ambari-infra/ambari-infra-manager/src/main/java/org/apache/ambari/infra/job/archive/FileAction.java
 create mode 100644 ambari-infra/ambari-infra-manager/src/main/java/org/apache/ambari/infra/job/archive/LocalDocumentItemWriter.java
 create mode 100644 ambari-infra/ambari-infra-manager/src/main/java/org/apache/ambari/infra/job/archive/S3Properties.java
 create mode 100644 ambari-infra/ambari-infra-manager/src/main/java/org/apache/ambari/infra/job/archive/S3Uploader.java
 create mode 100644 ambari-infra/ambari-infra-manager/src/main/java/org/apache/ambari/infra/job/archive/SolrDocumentIterator.java
 create mode 100644 ambari-infra/ambari-infra-manager/src/main/java/org/apache/ambari/infra/job/archive/SolrDocumentSource.java
 create mode 100644 ambari-infra/ambari-infra-manager/src/main/java/org/apache/ambari/infra/job/archive/SolrQueryBuilder.java
 create mode 100644 ambari-infra/ambari-infra-manager/src/main/java/org/apache/ambari/infra/job/archive/SolrQueryProperties.java
 create mode 100644 ambari-infra/ambari-infra-manager/src/main/java/org/apache/ambari/infra/job/archive/TarGzCompressor.java
 create mode 100644 ambari-infra/ambari-infra-manager/src/test/java/org/apache/ambari/infra/job/archive/DocumentExporterTest.java
 create mode 100644 ambari-infra/ambari-infra-manager/src/test/java/org/apache/ambari/infra/job/archive/DocumentItemReaderTest.java
 create mode 100644 ambari-infra/ambari-infra-manager/src/test/java/org/apache/ambari/infra/job/archive/LocalDocumentItemWriterTest.java
 create mode 100644 ambari-infra/ambari-infra-manager/src/test/java/org/apache/ambari/infra/job/archive/SolrQueryBuilderTest.java
 create mode 100644 ambari-logsearch/ambari-logsearch-logfeeder/src/main/resources/log-samples/.gitignore
 create mode 100644 ambari-logsearch/ambari-logsearch-logfeeder/src/main/resources/log-samples/logs/service_sample.txt
 create mode 100644 ambari-logsearch/ambari-logsearch-logfeeder/src/main/resources/log-samples/shipper-conf/global.config.json
 create mode 100644 ambari-logsearch/ambari-logsearch-logfeeder/src/main/resources/log-samples/shipper-conf/input.config-sample.json
 create mode 100644 ambari-logsearch/ambari-logsearch-logfeeder/src/main/resources/log-samples/shipper-conf/output.config-sample.json
 create mode 100644 ambari-logsearch/ambari-logsearch-web/src/app/classes/components/logs-table-component.spec.ts
 create mode 100644 ambari-logsearch/ambari-logsearch-web/src/app/classes/components/logs-table-component.ts
 create mode 100644 ambari-logsearch/ambari-logsearch-web/src/app/classes/filtering.ts
 create mode 100644 ambari-logsearch/ambari-logsearch-web/src/app/classes/models/node-item.ts
 delete mode 100644 ambari-logsearch/ambari-logsearch-web/src/app/classes/models/node.ts
 create mode 100644 ambari-logsearch/ambari-logsearch-web/src/app/classes/models/tab.ts
 create mode 100644 ambari-logsearch/ambari-logsearch-web/src/app/classes/string.ts
 create mode 100644 ambari-logsearch/ambari-logsearch-web/src/app/components/action-menu/action-menu.component.html
 create mode 100644 ambari-logsearch/ambari-logsearch-web/src/app/components/action-menu/action-menu.component.less
 create mode 100644 ambari-logsearch/ambari-logsearch-web/src/app/components/action-menu/action-menu.component.spec.ts
 create mode 100644 ambari-logsearch/ambari-logsearch-web/src/app/components/action-menu/action-menu.component.ts
 create mode 100644 ambari-logsearch/ambari-logsearch-web/src/app/components/audit-logs-table/audit-logs-table.component.html
 create mode 100644 ambari-logsearch/ambari-logsearch-web/src/app/components/audit-logs-table/audit-logs-table.component.less
 create mode 100644 ambari-logsearch/ambari-logsearch-web/src/app/components/audit-logs-table/audit-logs-table.component.spec.ts
 create mode 100644 ambari-logsearch/ambari-logsearch-web/src/app/components/audit-logs-table/audit-logs-table.component.ts
 create mode 100644 ambari-logsearch/ambari-logsearch-web/src/app/components/collapsible-panel/collapsible-panel.component.html
 create mode 100644 ambari-logsearch/ambari-logsearch-web/src/app/components/collapsible-panel/collapsible-panel.component.less
 create mode 100644 ambari-logsearch/ambari-logsearch-web/src/app/components/collapsible-panel/collapsible-panel.component.spec.ts
 create mode 100644 ambari-logsearch/ambari-logsearch-web/src/app/components/collapsible-panel/collapsible-panel.component.ts
 create mode 100644 ambari-logsearch/ambari-logsearch-web/src/app/components/log-level/log-level.component.html
 create mode 100644 ambari-logsearch/ambari-logsearch-web/src/app/components/log-level/log-level.component.spec.ts
 create mode 100644 ambari-logsearch/ambari-logsearch-web/src/app/components/log-level/log-level.component.ts
 create mode 100644 ambari-logsearch/ambari-logsearch-web/src/app/components/log-message/log-message.component.html
 create mode 100644 ambari-logsearch/ambari-logsearch-web/src/app/components/log-message/log-message.component.less
 create mode 100644 ambari-logsearch/ambari-logsearch-web/src/app/components/log-message/log-message.component.spec.ts
 create mode 100644 ambari-logsearch/ambari-logsearch-web/src/app/components/log-message/log-message.component.ts
 delete mode 100644 ambari-logsearch/ambari-logsearch-web/src/app/components/logs-list/logs-list.component.html
 delete mode 100644 ambari-logsearch/ambari-logsearch-web/src/app/components/logs-list/logs-list.component.less
 delete mode 100644 ambari-logsearch/ambari-logsearch-web/src/app/components/logs-list/logs-list.component.spec.ts
 delete mode 100644 ambari-logsearch/ambari-logsearch-web/src/app/components/logs-list/logs-list.component.ts
 create mode 100644 ambari-logsearch/ambari-logsearch-web/src/app/components/main.less
 create mode 100644 ambari-logsearch/ambari-logsearch-web/src/app/components/mixins.less
 create mode 100644 ambari-logsearch/ambari-logsearch-web/src/app/components/service-logs-table/service-logs-table.component.html
 create mode 100644 ambari-logsearch/ambari-logsearch-web/src/app/components/service-logs-table/service-logs-table.component.less
 create mode 100644 ambari-logsearch/ambari-logsearch-web/src/app/components/service-logs-table/service-logs-table.component.spec.ts
 create mode 100644 ambari-logsearch/ambari-logsearch-web/src/app/components/service-logs-table/service-logs-table.component.ts
 create mode 100644 ambari-logsearch/ambari-logsearch-web/src/app/components/tabs/tabs.component.html
 create mode 100644 ambari-logsearch/ambari-logsearch-web/src/app/components/tabs/tabs.component.less
 create mode 100644 ambari-logsearch/ambari-logsearch-web/src/app/components/tabs/tabs.component.spec.ts
 create mode 100644 ambari-logsearch/ambari-logsearch-web/src/app/components/tabs/tabs.component.ts
 create mode 100644 ambari-logsearch/ambari-logsearch-web/src/app/services/auth.service.spec.ts
 create mode 100644 ambari-logsearch/ambari-logsearch-web/src/app/services/auth.service.ts
 delete mode 100644 ambari-logsearch/ambari-logsearch-web/src/app/services/filtering.service.spec.ts
 delete mode 100644 ambari-logsearch/ambari-logsearch-web/src/app/services/filtering.service.ts
 create mode 100644 ambari-logsearch/ambari-logsearch-web/src/app/services/storage/tabs.service.ts
 create mode 100644 ambari-logsearch/docker/all.yml
 create mode 100644 ambari-logsearch/docker/docker-compose.yml
 create mode 100644 ambari-logsearch/docker/logsearch-logfeeder.yml
 create mode 100644 ambari-logsearch/docker/logsearch-server.yml
 create mode 100644 ambari-logsearch/docker/solr.yml
 create mode 100644 ambari-logsearch/docker/zookeeper.yml
 create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/ClusterSettingNotFoundException.java
 create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/api/resources/ClusterSettingResourceDefinition.java
 create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/api/resources/RootStackSettingsResourceDefinition.java
 create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/api/resources/ServiceDependencyResourceDefinition.java
 create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/api/resources/ServiceGroupDependencyResourceDefinition.java
 create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/api/services/ClusterSettingService.java
 create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/api/services/RootServiceComponentConfigurationRequestSwagger.java
 create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/api/services/RootServiceComponentConfigurationResponseSwagger.java
 create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/api/services/RootServiceComponentConfigurationService.java
 create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/api/services/ServiceGroupKey.java
 create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/api/services/ServiceKey.java
 create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/checks/LZOCheck.java
 create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/checks/RequiredServicesInRepositoryCheck.java
 create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/controller/ClusterSettingRequest.java
 create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/controller/ClusterSettingResponse.java
 create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/controller/RootComponent.java
 create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/controller/RootService.java
 create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceDependencyRequest.java
 create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceDependencyResponse.java
 create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceGroupDependencyRequest.java
 create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceGroupDependencyResponse.java
 delete mode 100644 ambari-server/src/main/java/org/apache/ambari/server/controller/StackV2.java
 delete mode 100644 ambari-server/src/main/java/org/apache/ambari/server/controller/StackV2Factory.java
 create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AmbariServerConfigurationCategory.java
 create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AmbariServerConfigurationHandler.java
 create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AmbariServerLDAPConfigurationHandler.java
 delete mode 100644 ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintV2ResourceProvider.java
 create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterSettingResourceProvider.java
 delete mode 100644 ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ConfigurationContext.java
 create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/controller/internal/OperationStatusMetaData.java
 create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RootServiceComponentConfigurationHandler.java
 create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RootServiceComponentConfigurationHandlerFactory.java
 create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RootServiceComponentConfigurationResourceProvider.java
 create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RootStackSettingsResourceProvider.java
 create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ServiceDependencyResourceProvider.java
 create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ServiceGroupDependencyResourceProvider.java
 create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/events/AmbariConfigurationChangedEvent.java
 create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/events/ClusterSettingEvent.java
 create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/ldap/LdapModule.java
 create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/ldap/domain/AmbariLdapConfiguration.java
 create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/ldap/domain/AmbariLdapConfigurationFactory.java
 create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/ldap/domain/AmbariLdapConfigurationKeys.java
 create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/ldap/service/AmbariLdapConfigurationProvider.java
 create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/ldap/service/AmbariLdapException.java
 create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/ldap/service/AmbariLdapFacade.java
 create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/ldap/service/AttributeDetector.java
 create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/ldap/service/LdapAttributeDetectionService.java
 create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/ldap/service/LdapConfigurationService.java
 create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/ldap/service/LdapConnectionConfigService.java
 create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/ldap/service/LdapFacade.java
 create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/ldap/service/ads/DefaultLdapAttributeDetectionService.java
 create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/ldap/service/ads/DefaultLdapConfigurationService.java
 create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/ldap/service/ads/DefaultLdapConnectionConfigService.java
 create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/ldap/service/ads/LdapConnectionTemplateFactory.java
 create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/ldap/service/ads/detectors/AttributeDetectorFactory.java
 create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/ldap/service/ads/detectors/ChainedAttributeDetector.java
 create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/ldap/service/ads/detectors/GroupMemberAttrDetector.java
 create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/ldap/service/ads/detectors/GroupNameAttrDetector.java
 create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/ldap/service/ads/detectors/GroupObjectClassDetector.java
 create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/ldap/service/ads/detectors/OccurrenceAndWeightBasedDetector.java
 create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/ldap/service/ads/detectors/UserGroupMemberAttrDetector.java
 create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/ldap/service/ads/detectors/UserNameAttrDetector.java
 create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/ldap/service/ads/detectors/UserObjectClassDetector.java
 create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/orm/dao/AmbariConfigurationDAO.java
 delete mode 100644 ambari-server/src/main/java/org/apache/ambari/server/orm/dao/BlueprintV2DAO.java
 create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ClusterSettingDAO.java
 create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/orm/dao/KerberosKeytabDAO.java
 create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/orm/entities/AmbariConfigurationEntity.java
 create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/orm/entities/AmbariConfigurationEntityPK.java
 delete mode 100644 ambari-server/src/main/java/org/apache/ambari/server/orm/entities/BlueprintV2Entity.java
 create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ClusterSettingEntity.java
 create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/orm/entities/KerberosKeytabEntity.java
 create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ServiceDependencyEntity.java
 create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ServiceGroupDependencyEntity.java
 delete mode 100644 ambari-server/src/main/java/org/apache/ambari/server/orm/entities/TopologyConfigurationsEntity.java
 delete mode 100644 ambari-server/src/main/java/org/apache/ambari/server/resources/ResourceLevelClusterSettingManager.java
 delete mode 100644 ambari-server/src/main/java/org/apache/ambari/server/resources/ResourceLevelClusterSettingManagerFactory.java
 create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/resources/RootLevelSettingsManager.java
 create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/resources/RootLevelSettingsManagerFactory.java
 create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/KDCKerberosOperationHandler.java
 create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/stageutils/ResolvedKerberosKeytab.java
 create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/AtlasProxyUserConfigCalculation.java
 create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/CreateAndConfigureAction.java
 create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/state/ClusterSetting.java
 create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/state/ClusterSettingFactory.java
 create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/state/ClusterSettingImpl.java
 create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/state/OsSpecific.java
 delete mode 100644 ambari-server/src/main/java/org/apache/ambari/server/state/ServiceOsSpecific.java
 create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/state/repository/StackPackage.java
 create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/state/stack/RepoTag.java
 create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/CreateAndConfigureTask.java
 delete mode 100644 ambari-server/src/main/java/org/apache/ambari/server/topology/BlueprintImplV2.java
 delete mode 100644 ambari-server/src/main/java/org/apache/ambari/server/topology/BlueprintV2.java
 delete mode 100644 ambari-server/src/main/java/org/apache/ambari/server/topology/BlueprintV2Factory.java
 delete mode 100644 ambari-server/src/main/java/org/apache/ambari/server/topology/BlueprintValidatorV2.java
 delete mode 100644 ambari-server/src/main/java/org/apache/ambari/server/topology/ComponentV2.java
 delete mode 100644 ambari-server/src/main/java/org/apache/ambari/server/topology/Configurable.java
 create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/topology/GPLLicenseNotAcceptedException.java
 delete mode 100644 ambari-server/src/main/java/org/apache/ambari/server/topology/HostGroupV2.java
 delete mode 100644 ambari-server/src/main/java/org/apache/ambari/server/topology/HostGroupV2Impl.java
 delete mode 100644 ambari-server/src/main/java/org/apache/ambari/server/topology/RepositoryVersion.java
 delete mode 100644 ambari-server/src/main/java/org/apache/ambari/server/topology/Service.java
 delete mode 100644 ambari-server/src/main/java/org/apache/ambari/server/topology/ServiceGroup.java
 delete mode 100644 ambari-server/src/main/java/org/apache/ambari/server/topology/ServiceId.java
 create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog261.java
 create mode 100644 ambari-server/src/main/resources/common-services/KAFKA/0.10.0/configuration/kafka-broker.xml
 create mode 100644 ambari-server/src/main/resources/common-services/KAFKA/0.10.0/configuration/kafka_client_jaas_conf.xml
 create mode 100644 ambari-server/src/main/resources/common-services/KAFKA/0.10.0/configuration/kafka_jaas_conf.xml
 create mode 100644 ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK2/configuration/spark2-log4j-properties.xml
 create mode 100644 ambari-server/src/main/resources/stacks/HDP/3.0/configuration/settings.xml
 create mode 100644 ambari-server/src/main/resources/stacks/PERF/1.0/hdp_urlinfo.json
 create mode 100644 ambari-server/src/main/resources/stacks/PERF/1.0/properties/stack_packages.json
 mode change 100644 => 100755 ambari-server/src/main/resources/stacks/PERF/1.0/repos/repoinfo.xml
 create mode 100644 ambari-server/src/main/resources/stacks/PERF/1.0/vdf.xml
 create mode 100644 ambari-server/src/main/resources/stacks/PERF/2.0/hdp_urlinfo.json
 mode change 100644 => 100755 ambari-server/src/main/resources/stacks/PERF/2.0/repos/repoinfo.xml
 create mode 100644 ambari-server/src/main/resources/stacks/PERF/2.0/vdf.xml
 create mode 100644 ambari-server/src/test/java/org/apache/ambari/server/checks/LZOCheckTest.java
 create mode 100644 ambari-server/src/test/java/org/apache/ambari/server/checks/RequiredServicesInRepositoryCheckTest.java
 create mode 100644 ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RootServiceComponentConfigurationResourceProviderTest.java
 create mode 100644 ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ServiceDependencyResourceProviderTest.java
 create mode 100644 ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ServiceGroupDependencyResourceProviderTest.java
 create mode 100644 ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ServiceGroupResourceProviderTest.java
 create mode 100644 ambari-server/src/test/java/org/apache/ambari/server/ldap/LdapModuleFunctionalTest.java
 create mode 100644 ambari-server/src/test/java/org/apache/ambari/server/ldap/domain/TestAmbariLdapConfigurationFactory.java
 create mode 100644 ambari-server/src/test/java/org/apache/ambari/server/ldap/service/AmbariLdapFacadeTest.java
 create mode 100644 ambari-server/src/test/java/org/apache/ambari/server/ldap/service/ads/DefaultLdapAttributeDetectionServiceTest.java
 create mode 100644 ambari-server/src/test/java/org/apache/ambari/server/ldap/service/ads/DefaultLdapConfigurationServiceTest.java
 create mode 100644 ambari-server/src/test/java/org/apache/ambari/server/ldap/service/ads/detectors/GroupMemberAttrDetectorTest.java
 create mode 100644 ambari-server/src/test/java/org/apache/ambari/server/orm/dao/AmbariConfigurationDAOTest.java
 create mode 100644 ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/KDCKerberosOperationHandlerTest.java
 create mode 100644 ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/AtlasProxyUserConfigCalculationTest.java
 create mode 100644 ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/CreateAndConfigureActionTest.java
 delete mode 100644 ambari-server/src/test/java/org/apache/ambari/server/topology/validators/BlueprintImplV2Test.java
 create mode 100644 ambari-server/src/test/python/TestSettings.py
 create mode 100644 ambari-server/src/test/python/stacks/2.5/HIVE/running_withMOTDmsg_andTrailingMsg.txt
 create mode 100644 ambari-server/src/test/python/stacks/2.6/KAFKA/test_kafka_broker_other_sasl.py
 create mode 100644 ambari-server/src/test/python/stacks/2.6/configs/default_kafka_plaintext.json
 create mode 100644 ambari-server/src/test/python/stacks/2.6/configs/default_kafka_plaintextsasl.json
 create mode 100644 ambari-server/src/test/python/stacks/2.6/configs/default_kafka_sasl_plaintext.json
 create mode 100644 ambari-server/src/test/python/stacks/2.6/configs/default_kafka_sasl_ssl.json
 delete mode 100644 ambari-server/src/test/resources/blueprintv2/blueprintv2.json
 copy ambari-server/src/{main => test}/resources/cluster-settings.xml (100%)
 create mode 100644 ambari-server/src/test/resources/extensions/EXT/0.4/metainfo.xml
 copy ambari-server/src/test/resources/extensions/EXT/{0.3 => 0.4}/services/OOZIE2/metainfo.xml (100%)
 copy ambari-server/src/test/resources/extensions/EXT/{0.3 => 0.4}/services/OOZIE2/themes/broken_theme.json (100%)
 create mode 100644 ambari-server/src/test/resources/version_definition_with_tags.xml
 create mode 100644 ambari-web/app/styles/visualsearch.less
 create mode 100644 ambari-web/app/views/common/search_box_view.js
 create mode 100644 ambari-web/app/views/main/alerts/alert_search_box.js
 create mode 100644 ambari-web/app/views/main/dashboard/config_history_search_box.js
 create mode 100644 ambari-web/test/views/common/search_box_view_test.js
 create mode 100644 ambari-web/test/views/main/alerts/alert_search_box_test.js
 create mode 100644 ambari-web/test/views/main/dashboard/config_history_search_box_test.js
 delete mode 100644 contrib/views/storm/src/main/resources/index.html
 delete mode 100644 contrib/views/storm/src/main/resources/libs/Backbone-Paginator/js/backbone-paginator.min.js
 delete mode 100644 contrib/views/storm/src/main/resources/libs/Backbone/js/Backbone.js
 delete mode 100644 contrib/views/storm/src/main/resources/libs/Bootstrap/css/bootstrap-editable.css
 delete mode 100644 contrib/views/storm/src/main/resources/libs/Bootstrap/css/bootstrap-slider.min.css
 delete mode 100644 contrib/views/storm/src/main/resources/libs/Bootstrap/css/bootstrap-switch.min.css
 delete mode 100644 contrib/views/storm/src/main/resources/libs/Bootstrap/css/bootstrap.css
 delete mode 100644 contrib/views/storm/src/main/resources/libs/Bootstrap/fonts/glyphicons-halflings-regular.svg
 delete mode 100755 contrib/views/storm/src/main/resources/libs/Bootstrap/images/clear.png
 delete mode 100755 contrib/views/storm/src/main/resources/libs/Bootstrap/images/loading.gif
 delete mode 100644 contrib/views/storm/src/main/resources/libs/Bootstrap/js/bootstrap-editable.min.js
 delete mode 100644 contrib/views/storm/src/main/resources/libs/Bootstrap/js/bootstrap-notify.min.js
 delete mode 100644 contrib/views/storm/src/main/resources/libs/Bootstrap/js/bootstrap-slider.min.js
 delete mode 100644 contrib/views/storm/src/main/resources/libs/Bootstrap/js/bootstrap-switch.min.js
 delete mode 100644 contrib/views/storm/src/main/resources/libs/Bootstrap/js/bootstrap.min.js
 delete mode 100644 contrib/views/storm/src/main/resources/libs/Font-Awesome/css/font-awesome.min.css
 delete mode 100644 contrib/views/storm/src/main/resources/libs/Font-Awesome/fonts/FontAwesome.otf
 delete mode 100644 contrib/views/storm/src/main/resources/libs/Font-Awesome/fonts/fontawesome-webfont.eot
 delete mode 100644 contrib/views/storm/src/main/resources/libs/Font-Awesome/fonts/fontawesome-webfont.svg
 delete mode 100644 contrib/views/storm/src/main/resources/libs/Font-Awesome/fonts/fontawesome-webfont.ttf
 delete mode 100644 contrib/views/storm/src/main/resources/libs/Font-Awesome/fonts/fontawesome-webfont.woff
 delete mode 100644 contrib/views/storm/src/main/resources/libs/Font-Awesome/fonts/fontawesome-webfont.woff2
 delete mode 100644 contrib/views/storm/src/main/resources/libs/Underscore/js/Underscore.js
 delete mode 100644 contrib/views/storm/src/main/resources/libs/bootbox/js/bootbox.min.js
 delete mode 100644 contrib/views/storm/src/main/resources/libs/d3/js/d3-tip.min.js
 delete mode 100644 contrib/views/storm/src/main/resources/libs/d3/js/d3.min.js
 delete mode 100644 contrib/views/storm/src/main/resources/libs/dagre-d3/dagre-d3.min.js
 delete mode 100644 contrib/views/storm/src/main/resources/libs/jQuery/js/jquery-2.2.3.min.js
 delete mode 100644 contrib/views/storm/src/main/resources/libs/jsx/JSXTransformer.js
 delete mode 100644 contrib/views/storm/src/main/resources/libs/jsx/jsx.js
 delete mode 100644 contrib/views/storm/src/main/resources/libs/react/js/react-dom.js
 delete mode 100644 contrib/views/storm/src/main/resources/libs/react/js/react-with-addons.js
 delete mode 100644 contrib/views/storm/src/main/resources/libs/require-js/js/require.min.js
 delete mode 100644 contrib/views/storm/src/main/resources/libs/require-text/js/text.js
 delete mode 100644 contrib/views/storm/src/main/resources/scripts/collections/BaseCollection.js
 delete mode 100644 contrib/views/storm/src/main/resources/scripts/collections/VNimbusConfigList.js
 delete mode 100644 contrib/views/storm/src/main/resources/scripts/collections/VNimbusList.js
 delete mode 100644 contrib/views/storm/src/main/resources/scripts/collections/VSupervisorList.js
 delete mode 100644 contrib/views/storm/src/main/resources/scripts/collections/VTopologyConfigList.js
 delete mode 100644 contrib/views/storm/src/main/resources/scripts/collections/VTopologyList.js
 delete mode 100644 contrib/views/storm/src/main/resources/scripts/components/BarChart.jsx
 delete mode 100644 contrib/views/storm/src/main/resources/scripts/components/Breadcrumbs.jsx
 delete mode 100644 contrib/views/storm/src/main/resources/scripts/components/Modal.jsx
 delete mode 100644 contrib/views/storm/src/main/resources/scripts/components/RadialChart.jsx
 delete mode 100644 contrib/views/storm/src/main/resources/scripts/components/SearchLogs.jsx
 delete mode 100644 contrib/views/storm/src/main/resources/scripts/components/Table.jsx
 delete mode 100644 contrib/views/storm/src/main/resources/scripts/components/TopologyGraph.jsx
 delete mode 100644 contrib/views/storm/src/main/resources/scripts/containers/ClusterSummary.jsx
 delete mode 100644 contrib/views/storm/src/main/resources/scripts/containers/NimbusConfigSummary.jsx
 delete mode 100644 contrib/views/storm/src/main/resources/scripts/containers/NimbusSummary.jsx
 delete mode 100644 contrib/views/storm/src/main/resources/scripts/containers/SupervisorSummary.jsx
 delete mode 100644 contrib/views/storm/src/main/resources/scripts/containers/TopologyConfiguration.jsx
 delete mode 100644 contrib/views/storm/src/main/resources/scripts/containers/TopologyDetailGraph.jsx
 delete mode 100644 contrib/views/storm/src/main/resources/scripts/containers/TopologyListing.jsx
 delete mode 100644 contrib/views/storm/src/main/resources/scripts/main.js
 delete mode 100644 contrib/views/storm/src/main/resources/scripts/models/BaseModel.js
 delete mode 100644 contrib/views/storm/src/main/resources/scripts/models/VCluster.js
 delete mode 100644 contrib/views/storm/src/main/resources/scripts/models/VNimbus.js
 delete mode 100644 contrib/views/storm/src/main/resources/scripts/models/VNimbusConfig.js
 delete mode 100644 contrib/views/storm/src/main/resources/scripts/models/VSupervisor.js
 delete mode 100644 contrib/views/storm/src/main/resources/scripts/models/VTopology.js
 delete mode 100644 contrib/views/storm/src/main/resources/scripts/models/VTopologyConfig.js
 delete mode 100644 contrib/views/storm/src/main/resources/scripts/modules/Table/PageableTable.jsx
 delete mode 100644 contrib/views/storm/src/main/resources/scripts/modules/Table/Pagination.jsx
 delete mode 100644 contrib/views/storm/src/main/resources/scripts/router/Router.js
 delete mode 100644 contrib/views/storm/src/main/resources/scripts/utils/Globals.js
 delete mode 100644 contrib/views/storm/src/main/resources/scripts/utils/Overrides.js
 delete mode 100644 contrib/views/storm/src/main/resources/scripts/utils/Utils.js
 delete mode 100644 contrib/views/storm/src/main/resources/scripts/views/ComponentDetailView.jsx
 delete mode 100644 contrib/views/storm/src/main/resources/scripts/views/Dashboard.jsx
 delete mode 100644 contrib/views/storm/src/main/resources/scripts/views/Footer.jsx
 delete mode 100644 contrib/views/storm/src/main/resources/scripts/views/NimbusSummaryView.jsx
 delete mode 100644 contrib/views/storm/src/main/resources/scripts/views/ProfilingView.jsx
 delete mode 100644 contrib/views/storm/src/main/resources/scripts/views/RebalanceView.jsx
 delete mode 100644 contrib/views/storm/src/main/resources/scripts/views/SupervisorSummaryView.jsx
 delete mode 100644 contrib/views/storm/src/main/resources/scripts/views/TopologyDetailView.jsx
 delete mode 100644 contrib/views/storm/src/main/resources/scripts/views/TopologyListingView.jsx
 delete mode 100644 contrib/views/storm/src/main/resources/styles/style.css
 create mode 100644 contrib/views/storm/src/main/resources/ui/.babelrc
 create mode 100644 contrib/views/storm/src/main/resources/ui/.eslintignore.js
 create mode 100644 contrib/views/storm/src/main/resources/ui/.eslintrc.js
 create mode 100644 contrib/views/storm/src/main/resources/ui/app/scripts/app.js
 create mode 100644 contrib/views/storm/src/main/resources/ui/app/scripts/components/BarChart.jsx
 create mode 100644 contrib/views/storm/src/main/resources/ui/app/scripts/components/Breadcrumbs.jsx
 create mode 100644 contrib/views/storm/src/main/resources/ui/app/scripts/components/CommonExpanded.jsx
 create mode 100644 contrib/views/storm/src/main/resources/ui/app/scripts/components/CommonNotification.jsx
 create mode 100644 contrib/views/storm/src/main/resources/ui/app/scripts/components/CommonPagination.jsx
 create mode 100644 contrib/views/storm/src/main/resources/ui/app/scripts/components/CommonSwitchComponent.jsx
 create mode 100644 contrib/views/storm/src/main/resources/ui/app/scripts/components/CommonWindowPanel.jsx
 create mode 100644 contrib/views/storm/src/main/resources/ui/app/scripts/components/CustomToastContainer.jsx
 create mode 100644 contrib/views/storm/src/main/resources/ui/app/scripts/components/Editable.jsx
 create mode 100644 contrib/views/storm/src/main/resources/ui/app/scripts/components/FSModel.jsx
 create mode 100644 contrib/views/storm/src/main/resources/ui/app/scripts/components/FSReactToastr.jsx
 create mode 100644 contrib/views/storm/src/main/resources/ui/app/scripts/components/Footer.jsx
 create mode 100644 contrib/views/storm/src/main/resources/ui/app/scripts/components/LogLevelComponent.jsx
 create mode 100644 contrib/views/storm/src/main/resources/ui/app/scripts/components/ProfilingView.jsx
 create mode 100644 contrib/views/storm/src/main/resources/ui/app/scripts/components/RadialChart.jsx
 create mode 100644 contrib/views/storm/src/main/resources/ui/app/scripts/components/RebalanceTopology.jsx
 create mode 100644 contrib/views/storm/src/main/resources/ui/app/scripts/components/SearchLogs.jsx
 create mode 100644 contrib/views/storm/src/main/resources/ui/app/scripts/components/TopologyGraph.jsx
 create mode 100644 contrib/views/storm/src/main/resources/ui/app/scripts/containers/BaseContainer.jsx
 create mode 100644 contrib/views/storm/src/main/resources/ui/app/scripts/containers/ClusterSummary.jsx
 create mode 100644 contrib/views/storm/src/main/resources/ui/app/scripts/containers/ComponentDetailView.jsx
 create mode 100644 contrib/views/storm/src/main/resources/ui/app/scripts/containers/Dashboard.jsx
 create mode 100644 contrib/views/storm/src/main/resources/ui/app/scripts/containers/NimbusConfigSummary.jsx
 create mode 100644 contrib/views/storm/src/main/resources/ui/app/scripts/containers/NimbusSummary.jsx
 create mode 100644 contrib/views/storm/src/main/resources/ui/app/scripts/containers/SupervisorSummary.jsx
 create mode 100644 contrib/views/storm/src/main/resources/ui/app/scripts/containers/TopologyDetailView.jsx
 create mode 100644 contrib/views/storm/src/main/resources/ui/app/scripts/containers/TopologyListing.jsx
 create mode 100644 contrib/views/storm/src/main/resources/ui/app/scripts/main.js
 create mode 100644 contrib/views/storm/src/main/resources/ui/app/scripts/rest/TopologyREST.js
 create mode 100644 contrib/views/storm/src/main/resources/ui/app/scripts/routers/routes.jsx
 create mode 100644 contrib/views/storm/src/main/resources/ui/app/scripts/utils/Constants.js
 create mode 100644 contrib/views/storm/src/main/resources/ui/app/scripts/utils/Utils.js
 create mode 100644 contrib/views/storm/src/main/resources/ui/app/styles/css/bootstrap.css
 create mode 100644 contrib/views/storm/src/main/resources/ui/app/styles/css/font-awesome.min.css
 create mode 100644 contrib/views/storm/src/main/resources/ui/app/styles/css/style.css
 create mode 100644 contrib/views/storm/src/main/resources/ui/app/styles/css/toastr.min.css
 create mode 100644 contrib/views/storm/src/main/resources/ui/app/styles/fonts/fontawesome-webfont.eot
 create mode 100644 contrib/views/storm/src/main/resources/ui/app/styles/fonts/fontawesome-webfont.svg
 create mode 100644 contrib/views/storm/src/main/resources/ui/app/styles/fonts/fontawesome-webfont.ttf
 create mode 100644 contrib/views/storm/src/main/resources/ui/app/styles/fonts/fontawesome-webfont.woff
 create mode 100644 contrib/views/storm/src/main/resources/ui/app/styles/fonts/fontawesome-webfont.woff2
 rename contrib/views/storm/src/main/resources/{libs/Bootstrap => ui/app/styles}/fonts/glyphicons-halflings-regular.eot (100%)
 mode change 100644 => 100755
 create mode 100755 contrib/views/storm/src/main/resources/ui/app/styles/fonts/glyphicons-halflings-regular.svg
 rename contrib/views/storm/src/main/resources/{libs/Bootstrap => ui/app/styles}/fonts/glyphicons-halflings-regular.ttf (100%)
 mode change 100644 => 100755
 rename contrib/views/storm/src/main/resources/{libs/Bootstrap => ui/app/styles}/fonts/glyphicons-halflings-regular.woff (100%)
 mode change 100644 => 100755
 rename contrib/views/storm/src/main/resources/{libs/Bootstrap => ui/app/styles}/fonts/glyphicons-halflings-regular.woff2 (100%)
 mode change 100644 => 100755
 rename contrib/views/storm/src/main/resources/{images => ui/app/styles/img}/icon-bolt.png (100%)
 rename contrib/views/storm/src/main/resources/{images => ui/app/styles/img}/icon-spout.png (100%)
 rename contrib/views/storm/src/main/resources/{images => ui/app/styles/img}/loader.gif (100%)
 create mode 100644 contrib/views/storm/src/main/resources/ui/config/webpack.config.base.js
 create mode 100644 contrib/views/storm/src/main/resources/ui/config/webpack.config.development.js
 create mode 100644 contrib/views/storm/src/main/resources/ui/config/webpack.config.production.js
 create mode 100644 contrib/views/storm/src/main/resources/ui/dev-server.js
 create mode 100644 contrib/views/storm/src/main/resources/ui/index.html
 create mode 100644 contrib/views/storm/src/main/resources/ui/package.json

-- 
To stop receiving notification emails like this one, please contact
['"commits@ambari.apache.org" <co...@ambari.apache.org>'].

[ambari] 01/01: Merge pull request #157 from jgolieb/UI-refresh

Posted by jo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

jonathanhurley pushed a commit to branch branch-feature-AMBARI-14714-ui
in repository https://gitbox.apache.org/repos/asf/ambari.git

commit 2685a0e7b69ee9d3fa97bad19beca252bf2fa24a
Merge: 50e28df 071c2c4
Author: Jonathan Hurley <jo...@apache.org>
AuthorDate: Fri Jan 19 14:59:33 2018 -0500

    Merge pull request #157 from jgolieb/UI-refresh
    
    Merging branch-feature-AMBARI-14714 into branch-feature-AMBARI-14714-ui

 .gitignore                                         |     3 +
 ambari-admin/pom.xml                               |     2 +-
 .../app/assets/fonts/Roboto-Regular-webfont.eot    |   Bin 0 -> 79547 bytes
 .../app/assets/fonts/Roboto-Regular-webfont.svg    |  7606 +++++++
 .../app/assets/fonts/Roboto-Regular-webfont.ttf    |   Bin 0 -> 234464 bytes
 .../app/assets/fonts/Roboto-Regular-webfont.woff   |   Bin 0 -> 105700 bytes
 .../src/main/resources/ui/admin-web/app/index.html |    97 +-
 .../main/resources/ui/admin-web/app/scripts/app.js |     5 +-
 .../admin-web/app/scripts/controllers/AppCtrl.js   |   177 +
 .../app/scripts/controllers/NavbarCtrl.js          |   106 -
 .../app/scripts/controllers/SideNavCtrl.js         |    68 +
 .../ambariViews/CreateViewInstanceCtrl.js          |   406 +-
 .../controllers/ambariViews/ViewsListCtrl.js       |   361 +-
 .../controllers/clusters/ClusterInformationCtrl.js |   106 +
 .../clusters/ClustersManageAccessCtrl.js           |    97 -
 .../controllers/clusters/ExportBlueprintCtrl.js    |    58 -
 .../controllers/clusters/UserAccessListCtrl.js     |   351 -
 .../scripts/controllers/groups/GroupsCreateCtrl.js |    65 -
 .../scripts/controllers/groups/GroupsEditCtrl.js   |   180 -
 .../scripts/controllers/groups/GroupsListCtrl.js   |   106 -
 .../admin-web/app/scripts/controllers/mainCtrl.js  |   183 -
 .../stackVersions/StackVersionsEditCtrl.js         |    27 +-
 .../controllers/userManagement/GroupCreateCtrl.js  |   120 +
 .../controllers/userManagement/GroupEditCtrl.js    |   248 +
 .../controllers/userManagement/GroupsListCtrl.js   |   167 +
 .../controllers/userManagement/UserCreateCtrl.js   |   113 +
 .../controllers/userManagement/UserEditCtrl.js     |   364 +
 .../userManagement/UserManagementCtrl.js           |    23 +
 .../controllers/userManagement/UsersListCtrl.js    |   177 +
 .../scripts/controllers/users/UsersCreateCtrl.js   |    75 -
 .../app/scripts/controllers/users/UsersListCtrl.js |   122 -
 .../app/scripts/controllers/users/UsersShowCtrl.js |   290 -
 .../ui/admin-web/app/scripts/i18n.config.js        |    51 +-
 .../resources/ui/admin-web/app/scripts/routes.js   |   161 +-
 .../ui/admin-web/app/scripts/services/Cluster.js   |    90 +-
 .../ui/admin-web/app/scripts/services/Group.js     |   144 +-
 .../app/scripts/services/GroupConstants.js         |    38 -
 .../app/scripts/services/RoleDetailsModal.js       |     5 +-
 .../ui/admin-web/app/scripts/services/Stack.js     |    17 +-
 .../ui/admin-web/app/scripts/services/User.js      |    20 +-
 .../ui/admin-web/app/scripts/services/View.js      |    40 +-
 .../app/scripts/theme/bootstrap-ambari.js          |   269 +
 .../admin-web/app/styles/cluster-information.css   |    58 +
 .../resources/ui/admin-web/app/styles/main.css     |   696 +-
 .../app/styles/theme/bootstrap-ambari.css          |  1518 ++
 .../ui/admin-web/app/styles/toggle-switch.css      |    72 +
 .../resources/ui/admin-web/app/styles/top-nav.css  |   200 +
 .../ui/admin-web/app/styles/user-management.css    |    43 +
 .../resources/ui/admin-web/app/styles/views.css    |   105 +
 .../ui/admin-web/app/views/ambariViews/create.html |   204 -
 .../ui/admin-web/app/views/ambariViews/edit.html   |    37 +-
 .../admin-web/app/views/ambariViews/listTable.html |   110 -
 .../admin-web/app/views/ambariViews/listUrls.html  |   117 -
 .../app/views/ambariViews/modals/create.html       |   312 +-
 .../app/views/ambariViews/modals/edit.html         |   138 -
 .../admin-web/app/views/ambariViews/viewsList.html |   151 +
 .../admin-web/app/views/authentication/main.html   |    14 +-
 .../app/views/clusters/clusterInformation.html     |    87 +
 .../app/views/clusters/exportBlueprint.html        |    40 -
 .../admin-web/app/views/clusters/manageAccess.html |    63 -
 .../app/views/clusters/userAccessList.html         |   102 -
 .../ui/admin-web/app/views/groups/create.html      |    43 -
 .../ui/admin-web/app/views/groups/edit.html        |    98 -
 .../ui/admin-web/app/views/groups/list.html        |    79 -
 .../ui/admin-web/app/views/leftNavbar.html         |   126 -
 .../app/views/loginActivities/homeDirectory.html   |     6 +-
 .../app/views/loginActivities/loginMessage.html    |     6 +-
 .../resources/ui/admin-web/app/views/main.html     |    96 -
 .../app/views/modals/AddVersionModal.html          |    14 +-
 .../admin-web/app/views/remoteClusters/list.html   |    11 +-
 .../resources/ui/admin-web/app/views/sideNav.html  |    99 +
 .../ui/admin-web/app/views/stackVersions/list.html |    22 +-
 .../app/views/stackVersions/stackVersionPage.html  |    55 +-
 .../ui/admin-web/app/views/urls/create.html        |     6 +-
 .../ui/admin-web/app/views/urls/edit.html          |     6 +-
 .../app/views/userManagement/groupEdit.html        |   122 +
 .../app/views/userManagement/groupsList.html       |    94 +
 .../admin-web/app/views/userManagement/main.html   |    36 +
 .../modals/changePassword.html                     |     0
 .../views/userManagement/modals/groupCreate.html   |    87 +
 .../views/userManagement/modals/userCreate.html    |   152 +
 .../app/views/userManagement/userEdit.html         |   144 +
 .../app/views/userManagement/usersList.html        |   119 +
 .../ui/admin-web/app/views/users/create.html       |    82 -
 .../ui/admin-web/app/views/users/list.html         |    96 -
 .../ui/admin-web/app/views/users/show.html         |   122 -
 .../src/main/resources/ui/admin-web/bower.json     |    45 +-
 .../src/main/resources/ui/admin-web/gulpfile.js    |    10 +-
 .../src/main/resources/ui/admin-web/package.json   |    10 +-
 .../test/unit/controllers/AppCtrl_test.js          |   211 +
 .../controllers/ClusterInformationCtrl_test.js     |   102 +
 .../unit/controllers/CreateViewInstanceCtrl.js     |   135 -
 .../clusters/UserAccessListCtrl_test.js            |   820 -
 .../unit/controllers/groups/GroupsListCtrl_test.js |   129 -
 .../test/unit/controllers/mainCtrl_test.js         |   215 -
 .../userManagement/GroupsListCtrl_test.js          |   129 +
 .../userManagement/UsersListCtrl_test.js           |   344 +
 .../unit/controllers/users/UsersListCtrl_test.js   |   383 -
 .../admin-web/test/unit/services/Utility_test.js   |    11 +-
 .../src/main/python/ambari_agent/ActionQueue.py    |     5 +-
 .../src/main/python/ambari_agent/AmbariAgent.py    |     3 -
 .../src/main/python/ambari_agent/Hardware.py       |   130 +-
 .../src/main/python/ambari_agent/Heartbeat.py      |     8 +-
 .../src/main/python/ambari_agent/HostInfo.py       |    83 +-
 .../main/python/ambari_agent/alerts/base_alert.py  |     2 +-
 .../test/python/ambari_agent/TestAmbariAgent.py    |     4 +-
 .../src/test/python/ambari_agent/TestHardware.py   |    56 +-
 .../test/python/ambari_agent/TestRegistration.py   |     5 +-
 .../core/providers/package/__init__.py             |     2 +-
 .../core/providers/package/apt.py                  |    23 +-
 .../core/providers/package/yumrpm.py               |    85 +-
 .../core/providers/package/zypper.py               |    37 +-
 .../libraries/functions/__init__.py                |     2 +-
 .../libraries/functions/cluster_settings.py        |    60 +
 .../libraries/functions/component_version.py       |     9 +-
 .../libraries/functions/conf_select.py             |    58 +
 .../libraries/functions/constants.py               |     1 +
 .../libraries/functions/copy_tarball.py            |   201 +-
 .../libraries/functions/curl_krb_request.py        |    22 +-
 .../libraries/functions/get_lzo_packages.py        |    50 -
 .../libraries/functions/lzo_utils.py               |    93 +
 .../libraries/functions/package_conditions.py      |    14 +-
 .../libraries/functions/repository_util.py         |    79 +-
 .../libraries/functions/settings.py                |   112 +
 .../libraries/functions/stack_features.py          |    15 +-
 .../libraries/functions/stack_select.py            |    16 +-
 .../libraries/functions/stack_settings.py          |    71 +
 .../libraries/functions/stack_tools.py             |    15 +-
 .../libraries/functions/tar_archive.py             |     6 +-
 .../resource_management/libraries/script/script.py |     4 +-
 ambari-funtest/pom.xml                             |    67 -
 .../funtest/server/tests/DeleteServiceTest.java    |    11 +-
 ambari-infra/ambari-infra-assembly/pom.xml         |     4 +
 ambari-infra/ambari-infra-manager/pom.xml          |    11 +
 .../infra/job/archive/CompositeFileAction.java     |    46 +
 .../apache/ambari/infra/job/archive/Document.java  |    54 +
 .../infra/job/archive/DocumentDestination.java     |    23 +
 .../job/archive/DocumentExportConfiguration.java   |   118 +
 .../job/archive/DocumentExportJobListener.java     |    35 +
 .../job/archive/DocumentExportProperties.java      |   112 +
 .../job/archive/DocumentExportStepListener.java    |    47 +
 .../ambari/infra/job/archive/DocumentExporter.java |    99 +
 .../infra/job/archive/DocumentItemReader.java      |   135 +
 .../infra/job/archive/DocumentItemWriter.java      |    25 +
 .../ambari/infra/job/archive/DocumentIterator.java |    25 +
 .../ambari/infra/job/archive/DocumentSource.java   |    24 +
 .../ambari/infra/job/archive/FileAction.java       |    25 +
 .../infra/job/archive/LocalDocumentItemWriter.java |    72 +
 .../ambari/infra/job/archive/S3Properties.java     |    64 +
 .../ambari/infra/job/archive/S3Uploader.java       |    51 +
 .../infra/job/archive/SolrDocumentIterator.java    |    90 +
 .../infra/job/archive/SolrDocumentSource.java      |    68 +
 .../ambari/infra/job/archive/SolrQueryBuilder.java |   115 +
 .../infra/job/archive/SolrQueryProperties.java     |    69 +
 .../ambari/infra/job/archive/TarGzCompressor.java  |    50 +
 .../apache/ambari/infra/manager/JobManager.java    |    21 +-
 .../src/main/resources/infra-manager.properties    |    12 +
 .../src/main/resources/log4j2.xml                  |     2 +-
 .../infra/job/archive/DocumentExporterTest.java    |   147 +
 .../infra/job/archive/DocumentItemReaderTest.java  |   197 +
 .../job/archive/LocalDocumentItemWriterTest.java   |    98 +
 .../infra/job/archive/SolrQueryBuilderTest.java    |   113 +
 .../infra/solr/AmbariSolrCloudClientBuilder.java   |     4 +-
 .../solr/commands/CreateCollectionCommand.java     |    12 +-
 .../infra/solr/commands/CreateShardCommand.java    |     5 +-
 .../infra/solr/commands/GetShardsCommand.java      |     2 +-
 ambari-infra/pom.xml                               |     2 +-
 ambari-logsearch/README.md                         |    27 +-
 ambari-logsearch/ambari-logsearch-assembly/pom.xml |     4 +-
 .../ambari-logsearch-logfeeder/README.md           |    17 +-
 .../ambari-logsearch-logfeeder/pom.xml             |    10 +-
 .../ambari/logfeeder/filter/FilterKeyValue.java    |     4 +-
 .../apache/ambari/logfeeder/input/InputFile.java   |     4 +-
 .../logfeeder/metrics/LogFeederAMSClient.java      |     3 +
 .../ambari/logfeeder/metrics/MetricsManager.java   |     8 +-
 .../src/main/resources/log-samples/.gitignore      |     4 +
 .../resources/log-samples/logs/service_sample.txt  |     3 +
 .../log-samples/shipper-conf/global.config.json    |    10 +
 .../shipper-conf/input.config-sample.json          |    31 +
 .../shipper-conf/output.config-sample.json         |    34 +
 .../src/main/resources/log4j.xml                   |     4 +-
 .../src/main/resources/logfeeder.properties        |    31 +-
 .../logfeeder/metrics/MetricsManagerTest.java      |    10 +-
 .../ambari-logsearch-server/.gitignore             |     1 +
 ambari-logsearch/ambari-logsearch-server/README.md |    44 +-
 ambari-logsearch/ambari-logsearch-server/pom.xml   |     6 +-
 ambari-logsearch/ambari-logsearch-server/run.sh    |     2 +-
 .../configsets/hadoop_logs/conf/managed-schema     |     2 +
 .../ambari/logsearch/conf/AuthPropsConfig.java     |    18 +
 .../ambari/logsearch/conf/SecurityConfig.java      |     6 +-
 .../ambari/logsearch/solr/SolrConstants.java       |     1 +
 .../logsearch/solr/model/SolrServiceLogData.java   |    17 +
 .../filters/LogsearchAuthenticationEntryPoint.java |    15 +-
 .../src/main/resources/logsearch.properties        |    54 +-
 ambari-logsearch/ambari-logsearch-web/package.json |     2 +-
 ambari-logsearch/ambari-logsearch-web/pom.xml      |     3 +
 .../ambari-logsearch-web/src/app/app.module.ts     |    24 +-
 .../components/logs-table-component.spec.ts        |    61 +
 .../app/classes/components/logs-table-component.ts |    51 +
 .../src/app/classes/filtering.ts                   |    70 +
 .../src/app/classes/models/app-state.ts            |    15 +-
 .../src/app/classes/models/audit-log.ts            |     2 +-
 .../src/app/classes/models/node-item.ts            |    30 +
 .../src/app/classes/models/node.ts                 |    30 -
 .../src/app/classes/models/store.ts                |    18 +-
 .../src/app/classes/models/tab.ts                  |    49 +
 .../app/classes/queries/audit-logs-query-params.ts |     3 +-
 .../queries/service-logs-truncated-query-params.ts |     3 +-
 .../ambari-logsearch-web/src/app/classes/string.ts |    25 +
 .../accordion-panel/accordion-panel.component.less |     2 +-
 .../action-menu/action-menu.component.html         |    20 +
 .../action-menu/action-menu.component.less         |    24 +
 .../action-menu/action-menu.component.spec.ts      |    47 +
 .../action-menu/action-menu.component.ts           |   101 +
 .../src/app/components/app.component.html          |     4 +-
 .../src/app/components/app.component.less          |     7 +-
 .../src/app/components/app.component.spec.ts       |     4 +-
 .../src/app/components/app.component.ts            |     6 +-
 .../audit-logs-table.component.html                |    56 +
 .../audit-logs-table.component.less                |    21 +
 .../audit-logs-table.component.spec.ts             |   157 +
 .../audit-logs-table/audit-logs-table.component.ts |    55 +
 .../collapsible-panel.component.html               |    27 +
 .../collapsible-panel.component.less               |    42 +
 .../collapsible-panel.component.spec.ts            |   139 +
 .../collapsible-panel.component.ts                 |    89 +
 .../date-picker/date-picker.component.spec.ts      |     2 +
 .../date-picker/date-picker.component.ts           |    35 +-
 .../dropdown-button/dropdown-button.component.html |     8 +-
 .../dropdown-button/dropdown-button.component.less |    19 +-
 .../dropdown-button.component.spec.ts              |    24 +-
 .../dropdown-button/dropdown-button.component.ts   |    58 +-
 .../dropdown-list/dropdown-list.component.html     |     2 +-
 .../dropdown-list/dropdown-list.component.less     |     2 +-
 .../dropdown-list/dropdown-list.component.spec.ts  |    15 +-
 .../filter-button/filter-button.component.spec.ts  |    24 +-
 .../filter-button/filter-button.component.ts       |    35 +-
 .../filter-dropdown.component.spec.ts              |    32 +-
 .../filter-dropdown/filter-dropdown.component.ts   |    22 +-
 .../filters-panel/filters-panel.component.html     |    39 +-
 .../filters-panel/filters-panel.component.less     |    17 +-
 .../filters-panel/filters-panel.component.spec.ts  |    12 +-
 .../filters-panel/filters-panel.component.ts       |   126 +-
 .../log-context/log-context.component.spec.ts      |     9 +-
 .../log-file-entry/log-file-entry.component.less   |     2 +-
 .../components/log-level/log-level.component.html  |    18 +
 .../log-level/log-level.component.spec.ts          |    73 +
 .../components/log-level/log-level.component.ts    |    52 +
 .../log-message/log-message.component.html         |    24 +
 .../log-message/log-message.component.less         |    69 +
 .../log-message/log-message.component.spec.ts      |    64 +
 .../log-message/log-message.component.ts           |   129 +
 .../login-form/login-form.component.spec.ts        |     7 +-
 .../components/login-form/login-form.component.ts  |    34 +-
 .../logs-container/logs-container.component.html   |    48 +-
 .../logs-container/logs-container.component.less   |    10 +-
 .../logs-container.component.spec.ts               |    18 +-
 .../logs-container/logs-container.component.ts     |   121 +-
 .../components/logs-list/logs-list.component.html  |    65 -
 .../components/logs-list/logs-list.component.less  |   109 -
 .../logs-list/logs-list.component.spec.ts          |    95 -
 .../components/logs-list/logs-list.component.ts    |   150 -
 .../main-container/main-container.component.html   |    10 +-
 .../main-container/main-container.component.less   |     6 +-
 .../main-container.component.spec.ts               |    15 +-
 .../main-container/main-container.component.ts     |    51 +-
 .../src/app/components/main.less                   |    20 +
 .../menu-button/menu-button.component.html         |    17 +-
 .../menu-button/menu-button.component.less         |    33 +-
 .../menu-button/menu-button.component.spec.ts      |    24 +-
 .../menu-button/menu-button.component.ts           |   151 +-
 .../src/app/components/mixins.less                 |   222 +
 .../pagination-controls.component.html             |    15 +-
 .../pagination-controls.component.less             |     2 +-
 .../pagination-controls.component.spec.ts          |   101 +
 .../pagination-controls.component.ts               |    76 +-
 .../pagination/pagination.component.html           |     6 +-
 .../pagination/pagination.component.less           |     4 +-
 .../pagination/pagination.component.spec.ts        |     9 +-
 .../components/pagination/pagination.component.ts  |    12 +-
 .../search-box/search-box.component.html           |    24 +-
 .../search-box/search-box.component.less           |    29 +-
 .../components/search-box/search-box.component.ts  |   158 +-
 .../service-logs-table.component.html              |    77 +
 .../service-logs-table.component.less              |    96 +
 .../service-logs-table.component.spec.ts           |   126 +
 .../service-logs-table.component.ts                |   135 +
 .../src/app/components/tabs/tabs.component.html    |    25 +
 .../src/app/components/tabs/tabs.component.less    |    22 +
 .../src/app/components/tabs/tabs.component.spec.ts |   125 +
 .../src/app/components/tabs/tabs.component.ts      |    48 +
 .../time-histogram/time-histogram.component.less   |     3 +-
 .../time-range-picker.component.html               |     9 +-
 .../time-range-picker.component.less               |     2 +-
 .../time-range-picker.component.spec.ts            |    42 +-
 .../time-range-picker.component.ts                 |    61 +-
 .../timezone-picker.component.spec.ts              |    24 +-
 .../components/top-menu/top-menu.component.html    |    15 +-
 .../components/top-menu/top-menu.component.less    |     6 +-
 .../components/top-menu/top-menu.component.spec.ts |    64 +-
 .../app/components/top-menu/top-menu.component.ts  |   105 +-
 .../src/app/components/variables.less              |   129 +-
 .../ambari-logsearch-web/src/app/mock-data.ts      |     7 +-
 .../src/app/services/auth.service.spec.ts          |   133 +
 .../src/app/services/auth.service.ts               |   123 +
 .../app/services/component-actions.service.spec.ts |    15 +-
 .../src/app/services/component-actions.service.ts  |    69 +-
 .../services/component-generator.service.spec.ts   |    13 +-
 .../src/app/services/filtering.service.spec.ts     |    94 -
 .../src/app/services/filtering.service.ts          |   566 -
 .../app/services/logs-container.service.spec.ts    |    40 +-
 .../src/app/services/logs-container.service.ts     |   839 +-
 .../src/app/services/mock-api-data.service.ts      |    22 +
 .../src/app/services/storage/reducers.service.ts   |     4 +-
 .../src/app/services/storage/tabs.service.ts       |    33 +
 .../src/app/services/utils.service.spec.ts         |   285 +-
 .../src/app/services/utils.service.ts              |    67 +-
 .../ambari-logsearch-web/src/assets/i18n/en.json   |    18 +-
 .../ambari-logsearch-web/webpack.config.js         |    35 +-
 ambari-logsearch/docker/.gitignore                 |     1 +
 ambari-logsearch/docker/Dockerfile                 |    19 +-
 ambari-logsearch/docker/all.yml                    |    40 +
 ambari-logsearch/docker/bin/start.sh               |    92 +-
 ambari-logsearch/docker/docker-compose.yml         |    89 +
 ambari-logsearch/docker/logsearch-docker.sh        |    51 +-
 ambari-logsearch/docker/logsearch-logfeeder.yml    |    35 +
 ambari-logsearch/docker/logsearch-server.yml       |    35 +
 ambari-logsearch/docker/solr.yml                   |    34 +
 .../test-config/logfeeder/logfeeder.properties     |     2 +-
 ambari-logsearch/docker/zookeeper.yml              |    52 +
 ambari-logsearch/pom.xml                           |     3 +-
 ambari-metrics/ambari-metrics-assembly/pom.xml     |     3 +-
 ambari-metrics/ambari-metrics-common/pom.xml       |     6 +
 ambari-metrics/ambari-metrics-hadoop-sink/pom.xml  |     4 +-
 .../sink/timeline/HadoopTimelineMetricsSink.java   |     6 +-
 .../timeline/HadoopTimelineMetricsSinkTest.java    |    21 +-
 .../ambari-metrics-timelineservice/pom.xml         |    10 +
 ambari-project/pom.xml                             |    52 +-
 .../docs/security/kerberos/kerberos_service.md     |    22 +-
 ambari-server/pom.xml                              |    97 +-
 ambari-server/src/main/assemblies/server.xml       |    10 +
 .../server/ClusterSettingNotFoundException.java    |    35 +
 .../ambari/server/ServiceNotFoundException.java    |     7 +
 .../actionmanager/ExecutionCommandWrapper.java     |    47 +-
 .../ambari/server/actionmanager/Request.java       |     4 +
 .../apache/ambari/server/actionmanager/Stage.java  |     6 +-
 .../ambari/server/agent/CommandRepository.java     |    85 +
 .../ambari/server/agent/ExecutionCommand.java      |    70 +-
 .../ambari/server/agent/HeartbeatMonitor.java      |     3 +-
 .../ambari/server/agent/HeartbeatProcessor.java    |    72 +-
 .../server/api/handlers/BaseManagementHandler.java |     8 -
 .../ambari/server/api/handlers/CreateHandler.java  |    12 +-
 .../ambari/server/api/handlers/UpdateHandler.java  |     8 +-
 .../api/query/render/ClusterBlueprintRenderer.java |    21 +-
 .../api/resources/ClusterResourceDefinition.java   |     1 +
 .../ClusterSettingResourceDefinition.java          |    45 +
 .../api/resources/ResourceInstanceFactoryImpl.java |    23 +
 .../RootServiceComponentResourceDefinition.java    |     9 +-
 .../RootStackSettingsResourceDefinition.java       |    51 +
 .../ServiceDependencyResourceDefinition.java       |    45 +
 .../ServiceGroupDependencyResourceDefinition.java  |    41 +
 .../resources/ServiceGroupResourceDefinition.java  |     1 +
 .../api/resources/ServiceResourceDefinition.java   |     3 +-
 .../ambari/server/api/services/AmbariMetaInfo.java |    82 +-
 .../ambari/server/api/services/BaseService.java    |     5 +-
 .../ambari/server/api/services/ClusterService.java |    13 +
 .../server/api/services/ClusterSettingService.java |   276 +
 .../server/api/services/ConfigurationService.java  |    41 +-
 .../ambari/server/api/services/LoggingService.java |     4 +
 .../api/services/RootClusterSettingService.java    |     2 +-
 ...erviceComponentConfigurationRequestSwagger.java |    43 +
 ...rviceComponentConfigurationResponseSwagger.java |    43 +
 .../RootServiceComponentConfigurationService.java  |   241 +
 .../server/api/services/RootServiceService.java    |     7 +
 .../api/services/ServiceConfigVersionService.java  |    39 +-
 .../server/api/services/ServiceGroupKey.java       |    99 +
 .../server/api/services/ServiceGroupService.java   |   153 +-
 .../ambari/server/api/services/ServiceKey.java     |   129 +
 .../ambari/server/api/services/ServiceService.java |   126 +-
 .../ambari/server/api/services/StacksService.java  |    89 +
 .../api/services/serializers/JsonSerializer.java   |    38 +-
 .../StackAdvisorBlueprintProcessor.java            |    14 +-
 .../services/stackadvisor/StackAdvisorRequest.java |    31 +
 .../stackadvisor/commands/StackAdvisorCommand.java |    77 +-
 .../services/users/ActiveWidgetLayoutService.java  |     2 +-
 .../api/services/views/ViewInstanceService.java    |     2 +-
 .../server/checks/AbstractCheckDescriptor.java     |    81 +-
 .../ambari/server/checks/CheckDescription.java     |    17 +
 .../checks/DatabaseConsistencyCheckHelper.java     |   134 +-
 .../org/apache/ambari/server/checks/LZOCheck.java  |    80 +
 .../checks/RequiredServicesInRepositoryCheck.java  |    91 +
 .../server/checks/ServiceCheckValidityCheck.java   |     9 +-
 .../apache/ambari/server/checks/UpgradeCheck.java  |    11 +
 .../ambari/server/configuration/Configuration.java |    32 +
 .../server/controller/ActionExecutionContext.java  |    14 +-
 .../ambari/server/controller/ActionRequest.java    |    16 +-
 .../ambari/server/controller/ActionResponse.java   |    13 +-
 .../controller/AmbariActionExecutionHelper.java    |    93 +-
 .../AmbariCustomCommandExecutionHelper.java        |   352 +-
 .../server/controller/AmbariHandlerList.java       |     5 +-
 .../controller/AmbariManagementController.java     |    45 +-
 .../controller/AmbariManagementControllerImpl.java |   761 +-
 .../server/controller/AmbariManagementHelper.java  |    26 +
 .../ambari/server/controller/AmbariServer.java     |    15 +-
 .../server/controller/ClusterSettingRequest.java   |    83 +
 .../server/controller/ClusterSettingResponse.java  |   147 +
 .../server/controller/ConfigGroupRequest.java      |    12 +-
 .../server/controller/ConfigurationRequest.java    |    40 +-
 .../server/controller/ConfigurationResponse.java   |    66 +
 .../ambari/server/controller/ControllerModule.java |    18 +-
 .../server/controller/DeleteIdentityHandler.java   |     6 +-
 .../ambari/server/controller/KerberosHelper.java   |    21 +-
 .../server/controller/KerberosHelperImpl.java      |   181 +-
 .../server/controller/MaintenanceStateHelper.java  |    17 +-
 .../server/controller/RepositoryRequest.java       |    22 +-
 .../server/controller/RepositoryResponse.java      |    23 +-
 .../server/controller/ResourceProviderFactory.java |    36 +-
 .../ambari/server/controller/RootComponent.java    |    27 +
 .../ambari/server/controller/RootService.java      |    36 +
 .../controller/RootServiceResponseFactory.java     |    44 +-
 .../controller/ServiceComponentHostRequest.java    |    35 +-
 .../controller/ServiceConfigVersionRequest.java    |    36 +-
 .../controller/ServiceConfigVersionResponse.java   |    24 +
 .../controller/ServiceDependencyRequest.java       |   109 +
 .../controller/ServiceDependencyResponse.java      |   207 +
 .../controller/ServiceGroupDependencyRequest.java  |    96 +
 .../controller/ServiceGroupDependencyResponse.java |   177 +
 .../server/controller/ServiceGroupRequest.java     |    29 +-
 .../server/controller/ServiceGroupResponse.java    |     2 +-
 .../apache/ambari/server/controller/StackV2.java   |   605 -
 .../ambari/server/controller/StackV2Factory.java   |   251 -
 .../AbstractControllerResourceProvider.java        |    16 +-
 .../internal/AbstractPropertyProvider.java         |     4 +
 .../internal/AbstractProviderModule.java           |     4 +-
 .../internal/AbstractResourceProvider.java         |     2 +-
 .../internal/ActionResourceProvider.java           |     9 +
 .../internal/AlertDefinitionResourceProvider.java  |     4 +
 .../internal/AlertGroupResourceProvider.java       |     4 +
 .../controller/internal/AlertResourceProvider.java |     4 +
 .../internal/AlertTargetResourceProvider.java      |     4 +
 .../AmbariServerConfigurationCategory.java         |    69 +
 .../internal/AmbariServerConfigurationHandler.java |   110 +
 .../AmbariServerLDAPConfigurationHandler.java      |   172 +
 .../internal/ArtifactResourceProvider.java         |     4 +
 .../controller/internal/BaseClusterRequest.java    |    38 +-
 .../server/controller/internal/BaseProvider.java   |     6 +-
 .../internal/BlueprintConfigurationProcessor.java  |   294 +-
 .../internal/BlueprintResourceProvider.java        |     7 +-
 .../internal/BlueprintV2ResourceProvider.java      |   391 -
 .../internal/ClientConfigResourceProvider.java     |    69 +-
 .../internal/ClusterResourceProvider.java          |    12 +-
 .../internal/ClusterSettingResourceProvider.java   |   554 +
 .../ClusterStackVersionResourceProvider.java       |    94 +-
 ...ompatibleRepositoryVersionResourceProvider.java |     4 +
 .../internal/ComponentResourceProvider.java        |     5 +
 .../internal/ConfigGroupResourceProvider.java      |    48 +-
 .../controller/internal/ConfigurationContext.java  |    60 -
 .../internal/ConfigurationResourceProvider.java    |   100 +-
 .../internal/CredentialResourceProvider.java       |     4 +
 .../controller/internal/DefaultProviderModule.java |    30 +-
 .../internal/ExportBlueprintRequest.java           |    34 +-
 .../internal/ExtensionLinkResourceProvider.java    |    15 +
 .../controller/internal/GroupResourceProvider.java |     4 +
 .../internal/HostComponentResourceProvider.java    |     4 +
 .../HostKerberosIdentityResourceProvider.java      |    16 +-
 .../controller/internal/HostResourceProvider.java  |    56 +-
 .../internal/HostStackVersionResourceProvider.java |     9 +-
 .../controller/internal/HostStatusHelper.java      |     2 +-
 .../controller/internal/HttpPropertyProvider.java  |     2 +-
 .../internal/JsonHttpPropertyRequest.java          |     2 +-
 .../internal/LdapSyncEventResourceProvider.java    |     2 +-
 .../internal/MemberResourceProvider.java           |     4 +
 .../internal/OperationStatusMetaData.java          |    90 +
 .../internal/ProvisionClusterRequest.java          |    49 +-
 .../QuickLinkArtifactResourceProvider.java         |     4 +
 .../internal/RecommendationResourceProvider.java   |     4 +
 .../internal/RepositoryResourceProvider.java       |     6 +-
 .../controller/internal/RequestOperationLevel.java |    15 +-
 .../controller/internal/RequestResourceFilter.java |    13 +-
 .../internal/RequestResourceProvider.java          |    30 +-
 .../RoleAuthorizationResourceProvider.java         |     4 +
 .../RootServiceComponentConfigurationHandler.java  |   114 +
 ...erviceComponentConfigurationHandlerFactory.java |    54 +
 ...viceComponentConfigurationResourceProvider.java |   445 +
 .../RootServiceComponentPropertyProvider.java      |     4 +-
 .../RootServiceComponentResourceProvider.java      |     4 +-
 .../RootStackSettingsResourceProvider.java         |   177 +
 .../controller/internal/ScaleClusterRequest.java   |    18 +-
 .../ServiceConfigVersionResourceProvider.java      |   121 +-
 .../ServiceDependencyResourceProvider.java         |   548 +
 .../ServiceGroupDependencyResourceProvider.java    |   505 +
 .../internal/ServiceGroupResourceProvider.java     |     5 +-
 .../internal/ServiceResourceProvider.java          |    16 +-
 .../internal/StackAdvisorResourceProvider.java     |    13 +-
 .../internal/StackArtifactResourceProvider.java    |     5 +
 .../controller/internal/StageResourceProvider.java |     4 +
 .../controller/internal/TaskResourceProvider.java  |     4 +
 .../internal/ThemeArtifactResourceProvider.java    |     4 +
 .../server/controller/internal/UnitUpdater.java    |    15 +-
 .../internal/UpgradeItemResourceProvider.java      |     4 +
 .../internal/UpgradeResourceProvider.java          |    68 +-
 .../controller/internal/UserResourceProvider.java  |     4 +
 .../internal/ValidationResourceProvider.java       |     4 +
 .../VersionDefinitionResourceProvider.java         |    13 +
 .../controller/jdbc/JDBCResourceProvider.java      |     2 +-
 .../server/controller/jmx/JMXPropertyProvider.java |     2 +-
 .../metrics/MetricsCollectorHAClusterState.java    |     2 +-
 .../metrics/MetricsCollectorHAManager.java         |     2 +-
 .../metrics/MetricsDownsamplingMethod.java         |     2 +-
 .../metrics/MetricsPropertyProvider.java           |     2 +-
 .../metrics/MetricsReportPropertyProvider.java     |     2 +-
 .../metrics/RestMetricsPropertyProvider.java       |     2 +-
 .../metrics/ThreadPoolEnabledPropertyProvider.java |     4 +
 .../metrics/ganglia/GangliaPropertyProvider.java   |     2 +-
 .../ganglia/GangliaReportPropertyProvider.java     |     2 +-
 .../metrics/timeline/AMSPropertyProvider.java      |     3 +
 .../timeline/AMSReportPropertyProvider.java        |     3 +
 .../ambari/server/controller/spi/Resource.java     |    11 +
 .../controller/utilities/DatabaseChecker.java      |     2 +-
 .../state/DefaultServiceCalculatedState.java       |     2 +-
 .../state/FlumeServiceCalculatedState.java         |     4 +
 .../state/HBaseServiceCalculatedState.java         |     4 +
 .../state/HDFSServiceCalculatedState.java          |     4 +
 .../state/HiveServiceCalculatedState.java          |     4 +
 .../state/OozieServiceCalculatedState.java         |     4 +
 .../state/YARNServiceCalculatedState.java          |     4 +
 .../server/customactions/ActionDefinition.java     |    15 +-
 .../customactions/ActionDefinitionManager.java     |    13 +-
 .../server/customactions/ActionDefinitionSpec.java |    10 +
 .../events/AmbariConfigurationChangedEvent.java    |    36 +
 .../apache/ambari/server/events/AmbariEvent.java   |    11 +-
 .../ambari/server/events/ClusterSettingEvent.java  |    46 +
 .../events/ServiceComponentUninstalledEvent.java   |    12 +-
 .../listeners/alerts/AlertReceivedListener.java    |    10 +-
 .../alerts/AlertStateChangedListener.java          |     6 +-
 .../org/apache/ambari/server/ldap/LdapModule.java  |    78 +
 .../ldap/domain/AmbariLdapConfiguration.java       |   206 +
 .../domain/AmbariLdapConfigurationFactory.java     |    34 +
 .../ldap/domain/AmbariLdapConfigurationKeys.java   |    83 +
 .../service/AmbariLdapConfigurationProvider.java   |   114 +
 .../server/ldap/service/AmbariLdapException.java   |    33 +
 .../server/ldap/service/AmbariLdapFacade.java      |   138 +
 .../server/ldap/service/AttributeDetector.java     |    41 +
 .../service/LdapAttributeDetectionService.java     |    40 +
 .../ldap/service/LdapConfigurationService.java     |    60 +
 .../ldap/service/LdapConnectionConfigService.java  |    36 +
 .../ambari/server/ldap/service/LdapFacade.java     |    59 +
 .../ads/DefaultLdapAttributeDetectionService.java  |   200 +
 .../ads/DefaultLdapConfigurationService.java       |   213 +
 .../ads/DefaultLdapConnectionConfigService.java    |   113 +
 .../service/ads/LdapConnectionTemplateFactory.java |   111 +
 .../ads/detectors/AttributeDetectorFactory.java    |    75 +
 .../ads/detectors/ChainedAttributeDetector.java    |    73 +
 .../ads/detectors/GroupMemberAttrDetector.java     |    65 +
 .../ads/detectors/GroupNameAttrDetector.java       |    69 +
 .../ads/detectors/GroupObjectClassDetector.java    |    69 +
 .../OccurrenceAndWeightBasedDetector.java          |   143 +
 .../ads/detectors/UserGroupMemberAttrDetector.java |    63 +
 .../ads/detectors/UserNameAttrDetector.java        |    71 +
 .../ads/detectors/UserObjectClassDetector.java     |    69 +
 .../ambari/server/metadata/ActionMetadata.java     |     8 +-
 .../metadata/AmbariServiceAlertDefinitions.java    |    20 +-
 .../apache/ambari/server/mpack/MpackGenerator.java |    20 +-
 .../apache/ambari/server/mpack/MpackManager.java   |    61 +
 .../dispatchers/AmbariSNMPDispatcher.java          |    10 +-
 .../apache/ambari/server/orm/DBAccessorImpl.java   |    24 +-
 .../ambari/server/orm/cache/HostConfigMapping.java |     7 +-
 .../server/orm/cache/HostConfigMappingImpl.java    |    30 +-
 .../ambari/server/orm/dao/AlertDefinitionDAO.java  |     7 +-
 .../ambari/server/orm/dao/AlertDispatchDAO.java    |     4 +-
 .../server/orm/dao/AmbariConfigurationDAO.java     |   179 +
 .../ambari/server/orm/dao/BlueprintV2DAO.java      |   124 -
 .../ambari/server/orm/dao/ClusterServiceDAO.java   |    32 +
 .../ambari/server/orm/dao/ClusterSettingDAO.java   |   100 +
 .../org/apache/ambari/server/orm/dao/DaoUtils.java |    13 +-
 .../server/orm/dao/HostConfigMappingDAO.java       |     8 +-
 .../ambari/server/orm/dao/KerberosKeytabDAO.java   |   110 +
 .../server/orm/dao/KerberosPrincipalDAO.java       |     7 +
 .../server/orm/dao/KerberosPrincipalHostDAO.java   |    40 +-
 .../ambari/server/orm/dao/ServiceConfigDAO.java    |    46 +-
 .../ambari/server/orm/dao/ServiceGroupDAO.java     |    50 +-
 .../orm/entities/AmbariConfigurationEntity.java    |   112 +
 .../orm/entities/AmbariConfigurationEntityPK.java  |    88 +
 .../server/orm/entities/BlueprintEntity.java       |     1 +
 .../server/orm/entities/BlueprintV2Entity.java     |    90 -
 .../server/orm/entities/ClusterConfigEntity.java   |    11 +
 .../ambari/server/orm/entities/ClusterEntity.java  |    11 +
 .../server/orm/entities/ClusterServiceEntity.java  |    41 +-
 .../server/orm/entities/ClusterSettingEntity.java  |   131 +
 .../server/orm/entities/ConfigGroupEntity.java     |    41 +-
 .../orm/entities/HostComponentStateEntity.java     |     2 +-
 .../orm/entities/HostConfigMappingEntity.java      |    59 +-
 .../orm/entities/HostGroupComponentEntity.java     |    16 +-
 .../orm/entities/HostGroupComponentEntityPK.java   |    36 -
 .../server/orm/entities/KerberosKeytabEntity.java  |    86 +
 .../orm/entities/KerberosPrincipalHostEntity.java  |    57 +-
 .../entities/KerberosPrincipalHostEntityPK.java    |    19 +-
 .../orm/entities/RemoteAmbariClusterEntity.java    |     2 +-
 .../server/orm/entities/RepositoryEntity.java      |    53 +-
 .../orm/entities/RepositoryVersionEntity.java      |    32 +-
 .../orm/entities/RequestOperationLevelEntity.java  |    12 +
 .../orm/entities/RequestResourceFilterEntity.java  |    12 +
 .../server/orm/entities/ServiceConfigEntity.java   |    66 +-
 .../orm/entities/ServiceDependencyEntity.java      |   154 +
 .../orm/entities/ServiceDesiredStateEntity.java    |     4 +-
 .../orm/entities/ServiceGroupDependencyEntity.java |   119 +
 .../server/orm/entities/ServiceGroupEntity.java    |    34 +-
 .../ambari/server/orm/entities/StackEntity.java    |    13 +-
 .../orm/entities/TopologyConfigurationsEntity.java |   148 -
 .../server/orm/entities/TopologyRequestEntity.java |    40 +-
 .../ResourceLevelClusterSettingManager.java        |   168 -
 .../ResourceLevelClusterSettingManagerFactory.java |    34 -
 .../server/resources/RootLevelSettingsManager.java |   172 +
 .../resources/RootLevelSettingsManagerFactory.java |    36 +
 .../AmbariLdapAuthenticationProvider.java          |     2 +-
 .../security/authorization/RoleAuthorization.java  |    95 +-
 .../security/encryption/CredentialProvider.java    |     2 +-
 .../server/serveraction/ServerActionExecutor.java  |   147 +-
 .../kerberos/ADKerberosOperationHandler.java       |    22 +-
 .../AbstractPrepareKerberosServerAction.java       |    68 +-
 .../serveraction/kerberos/CleanupServerAction.java |    14 +-
 .../server/serveraction/kerberos/Component.java    |    13 +-
 .../ConfigureAmbariIdentitiesServerAction.java     |    31 +-
 .../kerberos/CreateKeytabFilesServerAction.java    |    65 +-
 .../kerberos/CreatePrincipalsServerAction.java     |    56 +-
 .../kerberos/DestroyPrincipalsServerAction.java    |     3 +-
 .../kerberos/IPAKerberosOperationHandler.java      |  1067 +-
 .../kerberos/KDCKerberosOperationHandler.java      |   391 +
 .../kerberos/KerberosIdentityDataFile.java         |     2 -
 .../kerberos/KerberosIdentityDataFileWriter.java   |     9 +-
 .../kerberos/KerberosOperationHandler.java         |    64 +-
 .../kerberos/KerberosServerAction.java             |    48 +-
 .../kerberos/MITKerberosOperationHandler.java      |   406 +-
 .../PrepareDisableKerberosServerAction.java        |     2 +-
 .../PrepareEnableKerberosServerAction.java         |     2 +-
 .../PrepareKerberosIdentitiesServerAction.java     |     8 +-
 .../stageutils/ResolvedKerberosKeytab.java         |   257 +
 .../upgrades/AtlasProxyUserConfigCalculation.java  |    62 +
 .../serveraction/upgrades/ConfigureAction.java     |    12 +-
 .../upgrades/CreateAndConfigureAction.java         |   164 +
 .../upgrades/FinalizeUpgradeAction.java            |    74 +-
 .../upgrades/PreconfigureKerberosAction.java       |    63 +-
 .../ambari/server/stack/ExtensionHelper.java       |    31 +-
 .../ambari/server/stack/MasterHostResolver.java    |     2 +-
 .../server/stack/ModuleFileUnmarshaller.java       |     4 +-
 .../org/apache/ambari/server/stack/RepoUtil.java   |     1 +
 .../ambari/server/stack/ServiceDirectory.java      |    29 +
 .../apache/ambari/server/stack/ServiceModule.java  |     8 +
 .../apache/ambari/server/stack/StackManager.java   |     5 -
 .../apache/ambari/server/stack/StackModule.java    |    21 +-
 .../org/apache/ambari/server/state/Cluster.java    |   182 +-
 .../apache/ambari/server/state/ClusterSetting.java |    56 +
 .../ambari/server/state/ClusterSettingFactory.java |    33 +
 .../ambari/server/state/ClusterSettingImpl.java    |   201 +
 .../apache/ambari/server/state/ConfigFactory.java  |     2 +-
 .../apache/ambari/server/state/ConfigHelper.java   |    50 +-
 .../org/apache/ambari/server/state/ConfigImpl.java |    15 +-
 .../ambari/server/state/ConfigMergeHelper.java     |     4 +-
 .../apache/ambari/server/state/DesiredConfig.java  |    51 +-
 .../org/apache/ambari/server/state/OsSpecific.java |   250 +
 .../apache/ambari/server/state/RepositoryInfo.java |    23 +-
 .../apache/ambari/server/state/RepositoryType.java |    18 +
 .../org/apache/ambari/server/state/Service.java    |    13 +
 .../apache/ambari/server/state/ServiceFactory.java |     4 +
 .../apache/ambari/server/state/ServiceGroup.java   |    25 +-
 .../ambari/server/state/ServiceGroupFactory.java   |     6 +-
 .../ambari/server/state/ServiceGroupImpl.java      |   176 +-
 .../apache/ambari/server/state/ServiceImpl.java    |   178 +-
 .../apache/ambari/server/state/ServiceInfo.java    |    28 +-
 .../ambari/server/state/ServiceOsSpecific.java     |   249 -
 .../org/apache/ambari/server/state/StackInfo.java  |    56 +
 .../apache/ambari/server/state/UpgradeContext.java |    57 +-
 .../apache/ambari/server/state/UpgradeHelper.java  |    25 +-
 .../server/state/alert/AlertDefinitionHash.java    |     8 +-
 .../ambari/server/state/cluster/ClusterImpl.java   |   726 +-
 .../server/state/configgroup/ConfigGroup.java      |    11 +-
 .../state/configgroup/ConfigGroupFactory.java      |     3 +-
 .../server/state/configgroup/ConfigGroupImpl.java  |    70 +-
 .../apache/ambari/server/state/host/HostImpl.java  |     3 +-
 .../state/repository/ClusterVersionSummary.java    |     3 +
 .../state/repository/ServiceVersionSummary.java    |    11 +-
 .../server/state/repository/StackPackage.java      |    69 +
 .../state/repository/VersionDefinitionXml.java     |   112 +-
 .../state/services/AmbariServerAlertService.java   |     4 +-
 .../state/services/MetricsRetrievalService.java    |     2 +-
 .../apache/ambari/server/state/stack/OsFamily.java |     2 +-
 .../apache/ambari/server/state/stack/RepoTag.java  |    34 +
 .../ambari/server/state/stack/RepositoryXml.java   |    13 +
 .../server/state/stack/StackMetainfoXml.java       |    44 +-
 .../ambari/server/state/stack/UpgradePack.java     |    33 +-
 .../state/stack/upgrade/ClusterGrouping.java       |    15 +
 .../server/state/stack/upgrade/ConfigureTask.java  |    16 +
 .../stack/upgrade/CreateAndConfigureTask.java      |    57 +
 .../stack/upgrade/RepositoryVersionHelper.java     |   373 +-
 .../ambari/server/state/stack/upgrade/Task.java    |     6 +-
 .../svccomphost/ServiceComponentHostImpl.java      |     3 +-
 .../ambari/server/topology/AmbariContext.java      |   257 +-
 .../apache/ambari/server/topology/Blueprint.java   |     2 +-
 .../ambari/server/topology/BlueprintFactory.java   |     3 +-
 .../ambari/server/topology/BlueprintImpl.java      |     3 +-
 .../ambari/server/topology/BlueprintImplV2.java    |   396 -
 .../apache/ambari/server/topology/BlueprintV2.java |   251 -
 .../ambari/server/topology/BlueprintV2Factory.java |   196 -
 .../ambari/server/topology/BlueprintValidator.java |     3 +-
 .../server/topology/BlueprintValidatorImpl.java    |    91 +-
 .../server/topology/BlueprintValidatorV2.java      |    43 -
 .../topology/ClusterConfigurationRequest.java      |    66 +-
 .../ambari/server/topology/ClusterTopology.java    |    15 +-
 .../server/topology/ClusterTopologyImpl.java       |    84 +-
 .../apache/ambari/server/topology/ComponentV2.java |   138 -
 .../ambari/server/topology/Configurable.java       |    40 -
 .../ambari/server/topology/Configuration.java      |     7 -
 .../topology/GPLLicenseNotAcceptedException.java   |    28 +
 .../ambari/server/topology/HostGroupImpl.java      |     2 +
 .../ambari/server/topology/HostGroupInfo.java      |    17 +-
 .../apache/ambari/server/topology/HostGroupV2.java |   137 -
 .../ambari/server/topology/HostGroupV2Impl.java    |   169 -
 .../apache/ambari/server/topology/HostRequest.java |    38 +-
 .../ambari/server/topology/LogicalRequest.java     |     4 +-
 .../ambari/server/topology/PersistedStateImpl.java |    60 +-
 .../ambari/server/topology/RepositoryVersion.java  |    71 -
 .../server/topology/SecurityConfiguration.java     |     7 +-
 .../org/apache/ambari/server/topology/Service.java |   152 -
 .../ambari/server/topology/ServiceGroup.java       |    92 -
 .../apache/ambari/server/topology/ServiceId.java   |    79 -
 .../org/apache/ambari/server/topology/Setting.java |    18 +-
 .../ambari/server/topology/TopologyManager.java    |    20 +-
 .../ambari/server/topology/TopologyRequest.java    |    10 +-
 .../topology/tasks/PersistHostResourcesTask.java   |    12 +-
 .../validators/ClusterConfigTypeValidator.java     |     8 +-
 .../topology/validators/HiveServiceValidator.java  |    47 +-
 .../RequiredConfigPropertiesValidator.java         |    91 +-
 .../validators/RequiredPasswordValidator.java      |    30 +-
 .../validators/StackConfigTypeValidator.java       |    31 +-
 .../server/topology/validators/UnitValidator.java  |    34 +-
 .../server/upgrade/AbstractUpgradeCatalog.java     |    17 +-
 .../ambari/server/upgrade/SchemaUpgradeHelper.java |    30 +-
 .../ambari/server/upgrade/UpgradeCatalog.java      |     6 +
 .../ambari/server/upgrade/UpgradeCatalog260.java   |   224 +-
 .../ambari/server/upgrade/UpgradeCatalog261.java   |   119 +
 .../ambari/server/upgrade/UpgradeCatalog300.java   |    51 +-
 .../apache/ambari/server/utils/RetryHelper.java    |     2 +-
 .../org/apache/ambari/server/utils/StageUtils.java |     2 +-
 .../apache/ambari/server/utils/VersionUtils.java   |    46 +-
 .../server/view/ViewDataMigrationUtility.java      |     2 +-
 .../apache/ambari/server/view/ViewExtractor.java   |     2 +-
 .../apache/ambari/server/view/ViewRegistry.java    |     2 +-
 .../server/view/ViewSubResourceProvider.java       |     4 +
 .../server/view/persistence/DataStoreImpl.java     |     2 +-
 ambari-server/src/main/python/ambari-server.py     |     2 +
 .../python/ambari_server/serverConfiguration.py    |    24 +
 .../src/main/python/ambari_server/serverSetup.py   |     7 +-
 .../src/main/python/ambari_server/serverUpgrade.py |    22 +-
 .../src/main/resources/Ambari-DDL-Derby-CREATE.sql |   182 +-
 .../src/main/resources/Ambari-DDL-MySQL-CREATE.sql |   177 +-
 .../main/resources/Ambari-DDL-Oracle-CREATE.sql    |   186 +-
 .../main/resources/Ambari-DDL-Postgres-CREATE.sql  |   179 +-
 .../resources/Ambari-DDL-SQLAnywhere-CREATE.sql    |   177 +-
 .../main/resources/Ambari-DDL-SQLServer-CREATE.sql |   178 +-
 .../src/main/resources/META-INF/persistence.xml    |     6 +-
 .../src/main/resources/cluster-settings.xml        |    12 +-
 .../1.6.1.2.2.0/package/scripts/accumulo_script.py |     1 +
 .../0.1.0/package/scripts/metrics_collector.py     |     4 +-
 .../0.1.0/package/scripts/metrics_grafana.py       |     4 +-
 .../0.1.0/package/scripts/metrics_monitor.py       |     4 +-
 .../ATLAS/0.1.0.2.3/package/scripts/params.py      |     2 +-
 .../ATLAS/0.7.0.3.0/package/scripts/params.py      |     2 +-
 .../DRUID/0.10.1/package/scripts/druid.py          |     3 +-
 .../DRUID/0.10.1/package/scripts/druid_node.py     |     1 +
 .../DRUID/0.10.1/package/scripts/params.py         |     5 +-
 .../common-services/DRUID/0.10.1/themes/theme.json |    26 +-
 .../FALCON/0.5.0.2.1/package/scripts/falcon.py     |    11 +-
 .../HBASE/0.96.0.2.0/configuration/hbase-site.xml  |    17 +-
 .../HBASE/2.0.0.3.0/service_advisor.py             |    12 +-
 .../common-services/HDFS/2.1.0.2.0/metainfo.xml    |    30 -
 .../HDFS/2.1.0.2.0/package/scripts/hdfs.py         |     8 +-
 .../2.1.0.2.0/package/scripts/install_params.py    |     4 -
 .../HDFS/2.1.0.2.0/package/scripts/params_linux.py |     5 -
 .../common-services/HDFS/3.0.0.3.0/metainfo.xml    |    30 -
 .../HDFS/3.0.0.3.0/package/scripts/hdfs.py         |     8 +-
 .../3.0.0.3.0/package/scripts/install_params.py    |     4 -
 .../HDFS/3.0.0.3.0/package/scripts/params_linux.py |     4 -
 .../HIVE/0.12.0.2.0/configuration/hive-site.xml    |   244 +-
 .../common-services/HIVE/0.12.0.2.0/metainfo.xml   |     5 -
 .../package/alerts/alert_hive_thrift_port.py       |     3 +-
 .../0.12.0.2.0/package/files/startMetastore.sh     |     4 +-
 .../HIVE/0.12.0.2.0/package/scripts/hive.py        |    49 +-
 .../0.12.0.2.0/package/scripts/hive_interactive.py |    13 +
 .../package/scripts/hive_server_interactive.py     |    20 +-
 .../0.12.0.2.0/package/scripts/hive_service.py     |    10 +-
 .../package/scripts/hive_service_interactive.py    |     5 +-
 .../0.12.0.2.0/package/scripts/params_linux.py     |     7 +-
 .../0.12.0.2.0/package/scripts/service_check.py    |     6 +-
 .../0.12.0.2.0/package/scripts/webhcat_service.py  |    19 +-
 .../HIVE/2.1.0.3.0/configuration/hive-site.xml     |    48 +
 .../common-services/HIVE/2.1.0.3.0/metainfo.xml    |    10 -
 .../HIVE/2.1.0.3.0/package/files/startMetastore.sh |     4 +-
 .../HIVE/2.1.0.3.0/package/scripts/hive.py         |    35 +
 .../2.1.0.3.0/package/scripts/hive_interactive.py  |    13 +
 .../HIVE/2.1.0.3.0/package/scripts/hive_service.py |     8 +-
 .../package/scripts/hive_service_interactive.py    |     5 +-
 .../HIVE/2.1.0.3.0/package/scripts/params_linux.py |    14 +-
 .../2.1.0.3.0/package/scripts/service_check.py     |     6 +-
 .../2.1.0.3.0/package/scripts/webhcat_service.py   |    19 +-
 .../KAFKA/0.10.0/configuration/kafka-broker.xml    |    39 +
 .../configuration/kafka_client_jaas_conf.xml       |    43 +
 .../KAFKA/0.10.0/configuration/kafka_jaas_conf.xml |   116 +
 .../KAFKA/0.8.1/configuration/kafka-env.xml        |     2 +-
 .../KAFKA/0.8.1/package/scripts/kafka.py           |     4 +-
 .../KAFKA/0.8.1/package/scripts/params.py          |    16 +-
 .../KAFKA/0.8.1/package/scripts/service_check.py   |    15 +-
 .../0.8.1/package/scripts/setup_ranger_kafka.py    |     8 +-
 .../KAFKA/0.8.1/package/scripts/upgrade.py         |     3 +-
 .../package/templates/kafka_client_jaas.conf.j2    |     3 +
 .../0.8.1/package/templates/kafka_jaas.conf.j2     |    47 +
 .../KAFKA/0.9.0/configuration/kafka-broker.xml     |     2 +-
 .../1.10.3-10/configuration/kerberos-env.xml       |    36 +-
 .../1.10.3-10/package/scripts/kerberos_common.py   |     7 +-
 .../1.10.3-30/configuration/kerberos-env.xml       |    36 +-
 .../1.10.3-30/package/scripts/kerberos_common.py   |     7 +-
 .../common-services/LOGSEARCH/0.5.0/metainfo.xml   |     6 +-
 .../1.0.0.2.3/package/scripts/service_check.py     |     3 +-
 .../OOZIE/4.0.0.2.0/package/scripts/oozie.py       |    38 +-
 .../4.0.0.2.0/package/scripts/params_linux.py      |     5 +-
 .../common-services/OOZIE/4.2.0.2.3/metainfo.xml   |     5 -
 .../common-services/OOZIE/4.2.0.3.0/metainfo.xml   |    14 +-
 .../OOZIE/4.2.0.3.0/package/scripts/oozie.py       |    15 +-
 .../4.2.0.3.0/package/scripts/params_linux.py      |     5 +-
 .../RANGER/0.4.0/package/scripts/ranger_admin.py   |    23 +-
 .../RANGER/0.4.0/package/scripts/ranger_tagsync.py |    23 +-
 .../1.0.0.3.0/package/scripts/ranger_admin.py      |    24 +-
 .../1.0.0.3.0/package/scripts/ranger_tagsync.py    |    23 +-
 .../0.5.0.2.3/configuration/kms-site.xml           |    26 -
 .../0.5.0.2.3/package/scripts/kms_server.py        |    21 +-
 .../1.0.0.3.0/configuration/kms-site.xml           |    26 -
 .../1.0.0.3.0/package/scripts/kms_server.py        |    19 +-
 .../scripts/alerts/alert_spark_thrift_port.py      |     8 +-
 .../SPARK/1.2.1/package/scripts/setup_spark.py     |     3 +-
 .../scripts/alerts/alert_spark2_thrift_port.py     |     8 +-
 .../SPARK2/2.0.0/package/scripts/setup_spark.py    |     3 +-
 .../common-services/SQOOP/1.4.4.2.0/metainfo.xml   |     5 -
 .../1.4.4.2.0/package/scripts/params_linux.py      |     4 +-
 .../common-services/SQOOP/1.4.4.3.0/metainfo.xml   |    10 -
 .../1.4.4.3.0/package/scripts/params_linux.py      |     4 +-
 .../0.9.1/package/scripts/supervisord_service.py   |     1 +
 .../package/scripts/supervisord_service.py         |     1 +
 .../SUPERSET/0.15.0/themes/theme.json              |    22 +-
 .../TEZ/0.4.0.2.1/package/scripts/params_linux.py  |     2 +-
 .../TEZ/0.4.0.2.1/package/scripts/tez.py           |     5 +-
 .../TEZ/0.9.0.3.0/configuration/tez-site.xml       |     4 +-
 .../TEZ/0.9.0.3.0/package/scripts/params_linux.py  |     2 +-
 .../TEZ/0.9.0.3.0/package/scripts/tez.py           |     4 +
 .../2.1.0.2.0/configuration-mapred/mapred-site.xml |     2 +-
 .../YARN/2.1.0.2.0/package/scripts/params_linux.py |    42 +-
 .../2.1.0.2.0/package/scripts/status_params.py     |    52 +-
 .../YARN/2.1.0.2.0/package/scripts/yarn.py         |     3 +
 .../3.0.0.3.0/configuration-mapred/mapred-site.xml |     2 +-
 .../YARN/3.0.0.3.0/configuration/yarn-site.xml     |     2 +-
 .../YARN/3.0.0.3.0/package/scripts/params_linux.py |    59 +-
 .../3.0.0.3.0/package/scripts/status_params.py     |    52 +-
 .../YARN/3.0.0.3.0/package/scripts/yarn.py         |     3 +
 .../YARN/3.0.0.3.0/service_advisor.py              |     3 +-
 .../ZEPPELIN/0.7.0/package/scripts/master.py       |   145 +-
 .../ZEPPELIN/0.7.0/package/scripts/params.py       |    26 +-
 .../common-services/ZOOKEEPER/3.4.5/metainfo.xml   |     1 +
 .../custom_actions/scripts/install_packages.py     |    17 +-
 .../custom_actions/scripts/ru_execute_tasks.py     |     5 +-
 .../stacks/BIGTOP/0.8/services/HIVE/metainfo.xml   |     4 -
 .../stacks/BIGTOP/0.8/services/OOZIE/metainfo.xml  |     4 -
 .../HDP/2.0.6.GlusterFS/services/HIVE/metainfo.xml |     4 -
 .../2.0.6.GlusterFS/services/OOZIE/metainfo.xml    |     4 -
 .../HDP/2.0.6/properties/stack_features.json       |    25 +
 .../HDP/2.0.6/properties/stack_packages.json       |   111 +-
 .../stacks/HDP/2.0.6/role_command_order.json       |     3 +-
 .../stacks/HDP/2.0.6/services/stack_advisor.py     |    35 +
 .../HDP/2.1.GlusterFS/services/HIVE/metainfo.xml   |     4 -
 .../HDP/2.1.GlusterFS/services/OOZIE/metainfo.xml  |     4 -
 .../2.1/services/HIVE/configuration/hive-site.xml  |     2 +-
 .../stacks/HDP/2.1/services/HIVE/metainfo.xml      |     5 -
 .../stacks/HDP/2.2/services/HDFS/metainfo.xml      |    35 -
 .../2.2/services/HIVE/configuration/hive-site.xml  |     2 +-
 .../stacks/HDP/2.2/services/HIVE/metainfo.xml      |    10 -
 .../stacks/HDP/2.2/services/OOZIE/metainfo.xml     |     5 -
 .../stacks/HDP/2.2/services/SQOOP/metainfo.xml     |    10 -
 .../2.2/services/TEZ/configuration/tez-site.xml    |     4 +-
 .../YARN/configuration-mapred/mapred-site.xml      |     2 +-
 .../HDP/2.3.GlusterFS/services/HIVE/metainfo.xml   |     9 -
 .../HDP/2.3.GlusterFS/services/SQOOP/metainfo.xml  |     9 -
 .../src/main/resources/stacks/HDP/2.3/metainfo.xml |     2 +-
 .../stacks/HDP/2.3/services/HDFS/metainfo.xml      |    30 -
 .../stacks/HDP/2.3/services/HIVE/metainfo.xml      |    10 -
 .../stacks/HDP/2.3/upgrades/config-upgrade.xml     |     7 +
 .../HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml    |     4 +
 .../stacks/HDP/2.3/upgrades/upgrade-2.6.xml        |     2 +
 .../stacks/HDP/2.4/upgrades/config-upgrade.xml     |     6 +
 .../HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml    |     4 +
 .../stacks/HDP/2.4/upgrades/upgrade-2.6.xml        |     2 +
 .../stacks/HDP/2.5/services/FALCON/metainfo.xml    |     4 +-
 .../stacks/HDP/2.5/services/HIVE/metainfo.xml      |    10 -
 .../2.5/services/YARN/configuration/yarn-site.xml  |     4 +-
 .../stacks/HDP/2.5/services/YARN/kerberos.json     |    12 +-
 .../stacks/HDP/2.5/services/stack_advisor.py       |     5 +-
 .../stacks/HDP/2.5/upgrades/config-upgrade.xml     |    35 +
 .../HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml    |    31 +-
 .../stacks/HDP/2.5/upgrades/upgrade-2.6.xml        |    50 +-
 .../resources/stacks/HDP/2.6/repos/repoinfo.xml    |     2 +-
 .../ATLAS/configuration/application-properties.xml |    15 +
 .../stacks/HDP/2.6/services/DRUID/kerberos.json    |    45 +-
 .../stacks/HDP/2.6/services/FALCON/metainfo.xml    |    26 +
 .../HIVE/configuration/hive-interactive-site.xml   |   225 +
 .../stacks/HDP/2.6/services/OOZIE/metainfo.xml     |    37 +
 .../configuration/spark2-log4j-properties.xml      |    56 +
 .../services/STORM/configuration/storm-site.xml    |     6 +-
 .../stacks/HDP/2.6/services/SUPERSET/kerberos.json |    10 +-
 .../2.6/services/YARN/configuration/yarn-site.xml  |     2 +-
 .../stacks/HDP/2.6/services/YARN/kerberos.json     |    24 +-
 .../stacks/HDP/2.6/services/stack_advisor.py       |    25 +-
 .../stacks/HDP/2.6/upgrades/config-upgrade.xml     |    67 +-
 .../HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml    |    33 +-
 .../stacks/HDP/2.6/upgrades/upgrade-2.6.xml        |    14 +
 .../stacks/HDP/3.0/configuration/settings.xml      |    91 +
 .../stacks/HDP/3.0/properties/stack_packages.json  |   110 +-
 .../stacks/HDP/3.0/role_command_order.json         |     2 +-
 .../stacks/HDP/3.0/services/HDFS/metainfo.xml      |    30 -
 .../YARN/configuration-mapred/mapred-site.xml      |     2 +-
 .../3.0/services/YARN/configuration/yarn-site.xml  |     4 +-
 .../stacks/PERF/1.0/configuration/cluster-env.xml  |    26 +
 .../resources/stacks/PERF/1.0/hdp_urlinfo.json     |    12 +
 .../PERF/1.0/hooks/before-INSTALL/scripts/hook.py  |     7 +
 .../stacks/PERF/1.0/properties/stack_packages.json |     8 +
 .../resources/stacks/PERF/1.0/repos/repoinfo.xml   |     1 +
 .../services/FAKEYARN/configuration/yarn-site.xml  |     4 +-
 .../KERBEROS/configuration/kerberos-env.xml        |    36 +-
 .../src/main/resources/stacks/PERF/1.0/vdf.xml     |    73 +
 .../resources/stacks/PERF/2.0/hdp_urlinfo.json     |    12 +
 .../resources/stacks/PERF/2.0/repos/repoinfo.xml   |     1 +
 .../src/main/resources/stacks/PERF/2.0/vdf.xml     |    74 +
 .../src/main/resources/stacks/stack_advisor.py     |     9 +
 ambari-server/src/main/resources/upgrade-pack.xsd  |     9 +-
 .../src/main/resources/version_definition.xsd      |    23 +-
 .../actionmanager/ExecutionCommandWrapperTest.java |    21 +-
 .../actionmanager/TestActionDBAccessorImpl.java    |    18 +-
 .../server/actionmanager/TestActionManager.java    |     6 +-
 .../server/actionmanager/TestActionScheduler.java  |   110 +-
 .../TestActionSchedulerThreading.java              |    10 +-
 .../ambari/server/actionmanager/TestStage.java     |     4 +-
 .../server/agent/DummyHeartbeatConstants.java      |     1 +
 .../server/agent/HeartbeatProcessorTest.java       |     8 +-
 .../ambari/server/agent/HeartbeatTestHelper.java   |     3 +-
 .../ambari/server/agent/TestHeartbeatHandler.java  |    11 +-
 .../ambari/server/agent/TestHeartbeatMonitor.java  |    16 +-
 .../alerts/ComponentVersionAlertRunnableTest.java  |     2 +
 .../query/render/ClusterBlueprintRendererTest.java |     4 +-
 .../api/query/render/DefaultRendererTest.java      |     4 +-
 .../api/query/render/MinimalRendererTest.java      |     4 +-
 .../resources/ClusterResourceDefinitionTest.java   |    21 +-
 .../resources/ServiceResourceDefinitionTest.java   |     6 +-
 .../server/api/services/AmbariMetaInfoTest.java    |     2 +-
 .../server/api/services/ComponentServiceTest.java  |     4 +-
 .../api/services/ConfigurationServiceTest.java     |     2 +-
 .../api/services/RootServiceServiceTest.java       |     2 +-
 .../server/api/services/ServiceServiceTest.java    |    10 +-
 .../StackAdvisorBlueprintProcessorTest.java        |    12 +-
 .../commands/StackAdvisorCommandTest.java          |   212 +
 .../server/checks/AbstractCheckDescriptorTest.java |     3 +
 .../server/checks/AutoStartDisabledCheckTest.java  |    12 +-
 .../checks/ClientRetryPropertyCheckTest.java       |     2 +
 .../checks/ComponentExistsInRepoCheckTest.java     |     6 +-
 .../checks/ComponentsInstallationCheckTest.java    |    15 +-
 .../server/checks/ConfigurationMergeCheckTest.java |     2 +
 .../checks/DatabaseConsistencyCheckHelperTest.java |   178 +-
 .../checks/DruidHighAvailabilityCheckTest.java     |     2 +
 .../checks/HiveMultipleMetastoreCheckTest.java     |     3 +
 .../server/checks/HiveNotRollingWarningTest.java   |     3 +
 .../server/checks/HostsHeartbeatCheckTest.java     |     2 +
 .../checks/HostsMasterMaintenanceCheckTest.java    |     5 +-
 .../checks/HostsRepositoryVersionCheckTest.java    |     2 +
 .../server/checks/InstallPackagesCheckTest.java    |     2 +
 .../server/checks/KafkaKerberosCheckTest.java      |     2 +
 .../apache/ambari/server/checks/LZOCheckTest.java  |   152 +
 ...pReduce2JobHistoryStatePreservingCheckTest.java |     2 +
 .../server/checks/RangerAuditDbCheckTest.java      |     3 +
 .../server/checks/RangerPasswordCheckTest.java     |     3 +
 .../server/checks/RangerSSLConfigCheckTest.java    |     3 +
 .../RequiredServicesInRepositoryCheckTest.java     |   115 +
 .../checks/SecondaryNamenodeDeletedCheckTest.java  |     3 +
 .../checks/ServiceCheckValidityCheckTest.java      |    27 +-
 .../checks/ServicesMaintenanceModeCheckTest.java   |     2 +
 ...ServicesMapReduceDistributedCacheCheckTest.java |     3 +
 .../ServicesNamenodeHighAvailabilityCheckTest.java |     3 +
 .../checks/ServicesNamenodeTruncateCheckTest.java  |     2 +
 .../ServicesTezDistributedCacheCheckTest.java      |     3 +
 .../ambari/server/checks/ServicesUpCheckTest.java  |    18 +-
 .../ServicesYarnWorkPreservingCheckTest.java       |     2 +
 .../server/checks/StormShutdownWarningTest.java    |     3 +
 .../server/checks/UpgradeCheckOrderTest.java       |     3 +-
 .../configuration/RecoveryConfigHelperTest.java    |    19 +-
 .../server/controller/ActionRequestTest.java       |     3 +-
 .../server/controller/ActionResponseTest.java      |     4 +-
 .../AmbariCustomCommandExecutionHelperTest.java    |   161 +-
 .../AmbariManagementControllerImplTest.java        |   174 +-
 .../controller/AmbariManagementControllerTest.java |  3085 ++-
 .../ambari/server/controller/AmbariServerTest.java |     3 +
 .../BackgroundCustomCommandExecutionTest.java      |    76 +-
 .../server/controller/ClusterResponseTest.java     |     2 +-
 .../server/controller/KerberosHelperTest.java      |    15 +-
 .../controller/MaintenanceStateHelperTest.java     |    22 +-
 ...reshYarnCapacitySchedulerReleaseConfigTest.java |    90 +-
 .../controller/RootServiceResponseFactoryTest.java |    27 +-
 .../internal/AbstractResourceProviderTest.java     |    57 +-
 .../internal/ActionResourceProviderTest.java       |    12 +-
 .../ActiveWidgetLayoutResourceProviderTest.java    |     4 +
 .../BlueprintConfigurationProcessorTest.java       |    36 +-
 .../internal/BlueprintResourceProviderTest.java    |     5 +-
 .../internal/ClientConfigResourceProviderTest.java |    42 +-
 .../ClusterStackVersionResourceProviderTest.java   |   353 +-
 .../internal/ComponentResourceProviderTest.java    |    65 +-
 .../internal/ConfigGroupResourceProviderTest.java  |    10 +-
 .../HostComponentResourceProviderTest.java         |    36 +-
 .../HostKerberosIdentityResourceProviderTest.java  |    12 +-
 .../internal/HostResourceProviderTest.java         |    32 +-
 .../HostStackVersionResourceProviderTest.java      |    30 +-
 .../controller/internal/JMXHostProviderTest.java   |   196 +-
 .../internal/RepositoryResourceProviderTest.java   |     6 +-
 ...ComponentConfigurationResourceProviderTest.java |   533 +
 .../RootServiceComponentPropertyProviderTest.java  |    15 +-
 .../RootServiceComponentResourceProviderTest.java  |     9 +-
 ...otServiceHostComponentResourceProviderTest.java |     2 +
 .../ServiceDependencyResourceProviderTest.java     |   573 +
 ...ServiceGroupDependencyResourceProviderTest.java |   527 +
 .../internal/ServiceGroupResourceProviderTest.java |    45 +
 .../internal/ServiceResourceProviderTest.java      |    25 +-
 .../internal/StackAdvisorResourceProviderTest.java |    97 +-
 .../StackConfigurationResourceProviderTest.java    |    11 +-
 .../internal/StackDefinedPropertyProviderTest.java |    10 +-
 ...tackLevelConfigurationResourceProviderTest.java |    14 +-
 .../server/controller/internal/StackTest.java      |    17 +-
 .../StackUpgradeConfigurationMergeTest.java        |     6 +-
 .../controller/internal/UnitUpdaterTest.java       |     6 +-
 .../internal/UpgradeResourceProviderTest.java      |    59 +-
 .../UpgradeSummaryResourceProviderTest.java        |     4 +-
 .../UserAuthorizationResourceProviderTest.java     |     6 +-
 .../internal/UserResourceProviderTest.java         |     4 +
 .../internal/ValidationResourceProviderTest.java   |     4 +-
 .../VersionDefinitionResourceProviderTest.java     |     4 +-
 .../logging/LoggingSearchPropertyProviderTest.java |    10 +-
 .../metrics/timeline/AMSPropertyProviderTest.java  |     2 +
 .../utilities/KerberosIdentityCleanerTest.java     |    13 +-
 .../state/GeneralServiceCalculatedStateTest.java   |     4 +-
 .../apache/ambari/server/events/EventsTest.java    |    35 +-
 .../upgrade/HostVersionOutOfSyncListenerTest.java  |    25 +-
 .../server/ldap/LdapModuleFunctionalTest.java      |   153 +
 .../domain/TestAmbariLdapConfigurationFactory.java |    29 +
 .../server/ldap/service/AmbariLdapFacadeTest.java  |   209 +
 .../DefaultLdapAttributeDetectionServiceTest.java  |   181 +
 .../ads/DefaultLdapConfigurationServiceTest.java   |   220 +
 .../ads/detectors/GroupMemberAttrDetectorTest.java |   107 +
 .../server/metadata/AgentAlertDefinitionsTest.java |     6 +-
 .../server/notifications/DispatchFactoryTest.java  |     3 +-
 .../dispatchers/AmbariSNMPDispatcherTest.java      |    23 +-
 .../server/orm/InMemoryDefaultTestModule.java      |     2 +
 .../apache/ambari/server/orm/JdbcPropertyTest.java |     5 +-
 .../apache/ambari/server/orm/OrmTestHelper.java    |    23 +-
 .../org/apache/ambari/server/orm/TestOrmImpl.java  |    14 +-
 .../server/orm/dao/AlertDefinitionDAOTest.java     |     7 +-
 .../server/orm/dao/AlertDispatchDAOTest.java       |    97 +-
 .../ambari/server/orm/dao/AlertsDAOTest.java       |    13 +-
 .../server/orm/dao/AmbariConfigurationDAOTest.java |   298 +
 .../server/orm/dao/ServiceConfigDAOTest.java       |    30 +-
 .../orm/entities/ServiceConfigEntityTest.java      |     2 +-
 ...apAuthenticationProviderForDNWithSpaceTest.java |    35 +-
 .../AmbariLdapAuthenticationProviderTest.java      |     3 +-
 .../authorization/AmbariLocalUserProviderTest.java |     3 +-
 .../authorization/LdapServerPropertiesTest.java    |     5 +-
 .../kerberos/ADKerberosOperationHandlerTest.java   |   261 +-
 .../AbstractPrepareKerberosServerActionTest.java   |    16 +-
 .../ConfigureAmbariIdentitiesServerActionTest.java |    11 +-
 .../kerberos/FinalizeKerberosServerActionTest.java |     5 +
 .../kerberos/IPAKerberosOperationHandlerTest.java  |   147 +-
 .../kerberos/KDCKerberosOperationHandlerTest.java  |   168 +
 .../kerberos/KerberosIdentityDataFileTest.java     |     8 +-
 .../kerberos/KerberosOperationHandlerTest.java     |   152 +-
 .../kerberos/KerberosServerActionTest.java         |   137 +-
 .../kerberos/MITKerberosOperationHandlerTest.java  |   633 +-
 .../AtlasProxyUserConfigCalculationTest.java       |   127 +
 .../upgrades/ComponentVersionCheckActionTest.java  |    43 +-
 .../serveraction/upgrades/ConfigureActionTest.java |    22 +-
 .../upgrades/CreateAndConfigureActionTest.java     |   352 +
 .../upgrades/PreconfigureKerberosActionTest.java   |    12 +-
 .../serveraction/upgrades/UpgradeActionTest.java   |    65 +-
 .../ambari/server/stack/ServiceModuleTest.java     |    40 +-
 .../stack/StackManagerCommonServicesTest.java      |    24 +-
 .../server/stack/StackManagerExtensionTest.java    |    28 +-
 .../ambari/server/stack/StackManagerTest.java      |    28 +-
 .../server/stageplanner/TestStagePlanner.java      |    70 +-
 .../ambari/server/state/CheckHelperTest.java       |     7 +
 .../ambari/server/state/ConfigGroupTest.java       |     3 +-
 .../ambari/server/state/ConfigHelperTest.java      |    66 +-
 .../ambari/server/state/DesiredConfigTest.java     |     4 +-
 .../ambari/server/state/ServiceComponentTest.java  |    58 +-
 .../apache/ambari/server/state/ServiceTest.java    |    25 +-
 .../ambari/server/state/UpgradeContextTest.java    |    38 +-
 .../ambari/server/state/UpgradeHelperTest.java     |    50 +-
 .../state/alerts/AlertEventPublisherTest.java      |    31 +-
 .../state/alerts/AlertReceivedListenerTest.java    |    16 +-
 .../state/alerts/AlertStateChangedEventTest.java   |     4 +-
 .../server/state/alerts/InitialAlertEventTest.java |    29 +-
 .../server/state/cluster/ClusterDeadlockTest.java  |    33 +-
 .../server/state/cluster/ClusterImplTest.java      |     6 +-
 .../ambari/server/state/cluster/ClusterTest.java   |   242 +-
 .../server/state/cluster/ClustersDeadlockTest.java |    63 +-
 .../ambari/server/state/cluster/ClustersTest.java  |    22 +-
 .../ConcurrentServiceConfigVersionTest.java        |    20 +-
 ...ceComponentHostConcurrentWriteDeadlockTest.java |    16 +-
 .../state/repository/VersionDefinitionTest.java    |    77 +-
 .../services/AlertNoticeDispatchServiceTest.java   |    53 +-
 .../state/stack/ConfigUpgradeValidityTest.java     |    10 +
 .../stack/upgrade/RepositoryVersionHelperTest.java |     2 +-
 .../svccomphost/ServiceComponentHostTest.java      |    75 +-
 .../server/testing/DBInconsistencyTests.java       |     8 +-
 .../ambari/server/topology/AmbariContextTest.java  |    46 +-
 .../ambari/server/topology/BlueprintImplTest.java  |    97 +-
 .../topology/BlueprintValidatorImplTest.java       |    10 +-
 .../server/topology/ClusterTopologyImplTest.java   |    40 +-
 .../topology/validators/BlueprintImplV2Test.java   |    79 -
 .../validators/HiveServiceValidatorTest.java       |     2 +-
 .../RequiredConfigPropertiesValidatorTest.java     |     2 +-
 .../validators/StackConfigTypeValidatorTest.java   |    29 +-
 .../topology/validators/UnitValidatorTest.java     |     6 +-
 .../server/upgrade/AbstractUpgradeCatalogTest.java |    23 +-
 .../server/upgrade/UpgradeCatalog252Test.java      |    19 +-
 .../server/upgrade/UpgradeCatalog260Test.java      |   171 +-
 .../server/upgrade/UpgradeCatalog300Test.java      |   233 +-
 .../apache/ambari/server/utils/StageUtilsTest.java |     2 +
 .../ambari/server/utils/TestVersionUtils.java      |     4 +
 .../ambari/server/view/ViewRegistryTest.java       |     2 +-
 ambari-server/src/test/python/TestAmbariServer.py  |    11 +-
 ambari-server/src/test/python/TestSettings.py      |   216 +
 .../configs/install_packages_config.json           |     1 +
 .../configs/install_packages_repository_file.json  |     1 +
 .../python/custom_actions/test_ru_execute_tasks.py |     6 +-
 .../stacks/2.0.6/HIVE/test_hive_metastore.py       |     8 +-
 .../python/stacks/2.0.6/HIVE/test_hive_server.py   |    18 +-
 .../stacks/2.0.6/HIVE/test_hive_service_check.py   |     2 +-
 .../stacks/2.0.6/HIVE/test_webhcat_server.py       |     4 -
 .../stacks/2.0.6/common/test_stack_advisor.py      |    59 +-
 .../stacks/2.0.6/configs/repository_file.json      |     1 +
 .../python/stacks/2.1/FALCON/test_falcon_server.py |    16 +-
 .../python/stacks/2.1/HIVE/test_hive_metastore.py  |     9 +-
 .../test/python/stacks/2.1/TEZ/test_tez_client.py  |     2 +-
 .../stacks/2.2/SPARK/test_job_history_server.py    |    12 +-
 .../python/stacks/2.2/SPARK/test_spark_client.py   |    12 +-
 .../python/stacks/2.2/common/test_conf_select.py   |    14 +-
 .../python/stacks/2.2/configs/oozie-upgrade.json   |     3 +-
 .../stacks/2.3/MAHOUT/test_mahout_service_check.py |     4 +-
 .../stacks/2.3/SPARK/test_spark_thrift_server.py   |     6 +-
 .../HIVE/running_withMOTDmsg_andTrailingMsg.txt    |    46 +
 .../python/stacks/2.5/HIVE/test_hive_server_int.py |    52 +-
 .../python/stacks/2.5/common/test_stack_advisor.py |     7 +-
 .../stacks/2.5/configs/ranger-admin-secured.json   |     2 -
 .../stacks/2.5/configs/ranger-kms-secured.json     |     2 -
 .../2.6/KAFKA/test_kafka_broker_other_sasl.py      |    97 +
 .../stacks/2.6/ZEPPELIN/test_zeppelin_070.py       |   111 +-
 .../python/stacks/2.6/common/test_stack_advisor.py |    43 +-
 .../2.6/configs/default_kafka_plaintext.json       |   631 +
 .../2.6/configs/default_kafka_plaintextsasl.json   |   631 +
 .../2.6/configs/default_kafka_sasl_plaintext.json  |   631 +
 .../stacks/2.6/configs/default_kafka_sasl_ssl.json |   631 +
 .../stacks/2.6/configs/ranger-admin-secured.json   |     2 -
 .../PreconfigureActionTest_cluster_config.json     |     4 +-
 .../test/resources/blueprintv2/blueprintv2.json    |   146 -
 .../{main => test}/resources/cluster-settings.xml  |     0
 .../test/resources/extensions/EXT/0.2/metainfo.xml |     4 +-
 .../test/resources/extensions/EXT/0.4/metainfo.xml |    32 +
 .../EXT/0.4/services/OOZIE2/metainfo.xml           |   118 +
 .../0.4/services/OOZIE2/themes/broken_theme.json   |     3 +
 .../test_kerberos_descriptor_ranger_kms.json       |   286 +
 .../src/test/resources/stacks/HDP/0.1/metainfo.xml |    10 +
 .../test/resources/stacks/HDP/2.0.1/metainfo.xml   |    18 +
 .../stacks/HDP/2.0.1/services/HIVE/metainfo.xml    |     8 -
 .../HDP/0.1/metainfo.xml                           |    10 +
 .../resources/version_definition_with_tags.xml     |    86 +
 ambari-utility/pom.xml                             |     6 +
 ambari-web/app/app.js                              |    24 +-
 ambari-web/app/assets/test/tests.js                |     3 +
 ambari-web/app/config.js                           |     1 -
 .../app/controllers/global/update_controller.js    |     2 +-
 ambari-web/app/controllers/installer.js            |    60 +-
 .../main/admin/kerberos/step1_controller.js        |    52 +-
 .../main/admin/kerberos/step2_controller.js        |     2 +-
 .../main/admin/stack_and_upgrade_controller.js     |     4 +-
 .../main/dashboard/config_history_controller.js    |    92 +-
 .../main/host/bulk_operations_controller.js        |    14 +-
 ambari-web/app/controllers/main/service/item.js    |    13 +-
 .../main/service/reassign/step3_controller.js      |    21 +-
 .../main/service/reassign/step4_controller.js      |    12 +-
 .../app/controllers/wizard/step8_controller.js     |    12 +-
 ambari-web/app/mappers/components_state_mapper.js  |     1 +
 .../app/mappers/repository_version_mapper.js       |     3 +-
 ambari-web/app/mappers/stack_mapper.js             |     3 +-
 ambari-web/app/messages.js                         |    32 +-
 ambari-web/app/mixins/common/serverValidator.js    |    41 +-
 .../mixins/main/host/details/actions/check_host.js |     8 +-
 ambari-web/app/mixins/wizard/addSecurityConfigs.js |     7 +
 .../app/mixins/wizard/assign_master_components.js  |     2 +-
 ambari-web/app/models/alerts/alert_definition.js   |    18 +-
 ambari-web/app/models/alerts/alert_group.js        |     2 +-
 ambari-web/app/models/client_component.js          |     1 +
 .../app/models/configs/service_config_version.js   |     9 +-
 ambari-web/app/models/host_stack_version.js        |     4 +-
 ambari-web/app/models/repository.js                |    17 +
 ambari-web/app/models/stack_version/repository.js  |     3 +-
 ambari-web/app/routes/installer.js                 |     3 +-
 ambari-web/app/routes/main.js                      |     2 +-
 ambari-web/app/styles/application.less             |    17 +-
 ambari-web/app/styles/common.less                  |     2 +-
 ambari-web/app/styles/dashboard.less               |     6 +-
 ambari-web/app/styles/hosts.less                   |    89 +-
 ambari-web/app/styles/theme/bootstrap-ambari.css   |    16 +-
 ambari-web/app/styles/visualsearch.less            |   100 +
 ambari-web/app/styles/wizard.less                  |    22 +
 .../common/configs/config_history_flow.hbs         |     8 +-
 .../common/configs/service_version_box.hbs         |     8 +-
 .../app/templates/common/host_progress_popup.hbs   |     6 +-
 .../modal_popups/config_recommendation_popup.hbs   |   102 +-
 .../common/modal_popups/widget_browser_popup.hbs   |     6 +-
 ambari-web/app/templates/experimental.hbs          |     6 +-
 ambari-web/app/templates/installer.hbs             |     2 +-
 .../main/admin/stack_upgrade/versions.hbs          |     6 +-
 ambari-web/app/templates/main/alerts.hbs           |    22 +-
 .../alert_definition/alert_definition_summary.hbs  |     2 +-
 .../main/alerts/alert_definitions_actions.hbs      |     2 +-
 ambari-web/app/templates/main/dashboard.hbs        |     2 +-
 .../templates/main/dashboard/config_history.hbs    |    25 +-
 ambari-web/app/templates/main/host.hbs             |    32 +-
 .../templates/main/host/bulk_operation_menu.hbs    |   134 +-
 .../app/templates/main/host/combo_search_box.hbs   |     9 +-
 .../templates/main/host/details/host_component.hbs |   176 +-
 .../app/templates/main/host/stack_versions.hbs     |     4 +-
 ambari-web/app/templates/main/host/summary.hbs     |   120 +-
 .../app/templates/main/service/reassign/step3.hbs  |     6 +-
 .../app/templates/main/service/services/hdfs.hbs   |   116 +-
 .../app/templates/main/service/services/yarn.hbs   |   184 +-
 ambari-web/app/templates/wizard/step1.hbs          |    36 +
 ambari-web/app/utils/ajax/ajax.js                  |     4 +
 ambari-web/app/utils/helper.js                     |    23 +
 ambari-web/app/views.js                            |     3 +
 ambari-web/app/views/common/controls_view.js       |     9 +-
 .../config_validation/config_validation_popup.js   |     7 +-
 ambari-web/app/views/common/search_box_view.js     |   165 +
 ambari-web/app/views/common/table_view.js          |    11 +
 .../stack_upgrade/upgrade_version_box_view.js      |     4 +-
 .../stack_upgrade/upgrade_version_column_view.js   |     1 -
 .../app/views/main/alert_definitions_view.js       |   264 -
 .../alert_definition/alert_definition_summary.js   |     2 +-
 .../app/views/main/alerts/alert_search_box.js      |   195 +
 .../main/dashboard/config_history_search_box.js    |   221 +
 .../views/main/dashboard/config_history_view.js    |   101 -
 ambari-web/app/views/main/host/combo_search_box.js |    36 +-
 .../app/views/main/host/hosts_table_menu_view.js   |     4 +-
 .../app/views/main/host/stack_versions_view.js     |     2 +-
 ambari-web/app/views/main/service/item.js          |     2 +-
 ambari-web/app/views/main/service/services/yarn.js |    21 +-
 ambari-web/test/controllers/installer_test.js      |    14 +-
 .../main/admin/kerberos/step1_controller_test.js   |    17 -
 .../main/admin/kerberos/step2_controller_test.js   |     2 +-
 .../test/controllers/main/service/item_test.js     |    49 +-
 .../main/service/reassign/step4_controller_test.js |     9 +-
 ambari-web/test/init_test.js                       |     8 +
 .../test/mixins/common/serverValidator_test.js     |    15 +-
 .../mixins/wizard/assign_master_components_test.js |     2 +-
 ambari-web/test/models/alerts/alert_group_test.js  |     5 +-
 ambari-web/test/utils/date/timezone_test.js        |     2 +-
 ambari-web/test/views/common/controls_view_test.js |     2 +-
 .../test/views/common/search_box_view_test.js      |   240 +
 .../test/views/main/alert_definitions_view_test.js |   152 -
 .../views/main/alerts/alert_search_box_test.js     |   168 +
 .../dashboard/config_history_search_box_test.js    |   207 +
 .../main/dashboard/config_history_view_test.js     |   188 +-
 .../test/views/main/host/combo_search_box_test.js  |    66 +-
 ambari-web/test/views/main/service/item_test.js    |     6 +-
 .../test/views/main/service/services/yarn_test.js  |    22 -
 .../vendor/scripts/theme/bootstrap-ambari.js       |    37 +-
 .../stacks/ODPi/2.0/services/HIVE/metainfo.xml     |    10 -
 contrib/utils/perf/deploy-gce-perf-cluster.py      |     1 +
 contrib/version-builder/version_builder.py         |    13 +-
 .../resources/ui/app/components/upload-file.js     |    38 +-
 .../views/files/src/main/resources/ui/bower.json   |     4 +-
 .../src/main/resources/ui/hive-web/bower.json      |     4 +-
 .../view/hive20/resources/browser/DDLProxy.java    |   154 +-
 .../hive20/resources/uploads/UploadService.java    |    12 +-
 .../uploads/query/InsertFromQueryInput.java        |    13 +-
 .../databases/database/tables/upload-table.js      |    12 +
 contrib/views/storm/pom.xml                        |   103 +-
 contrib/views/storm/src/main/resources/index.html  |    45 -
 .../js/backbone-paginator.min.js                   |  1325 --
 .../main/resources/libs/Backbone/js/Backbone.js    |  1920 --
 .../libs/Bootstrap/css/bootstrap-editable.css      |   663 -
 .../libs/Bootstrap/css/bootstrap-slider.min.css    |    28 -
 .../libs/Bootstrap/css/bootstrap-switch.min.css    |    22 -
 .../resources/libs/Bootstrap/css/bootstrap.css     |  5959 ------
 .../fonts/glyphicons-halflings-regular.svg         |   288 -
 .../main/resources/libs/Bootstrap/images/clear.png |   Bin 509 -> 0 bytes
 .../resources/libs/Bootstrap/images/loading.gif    |   Bin 1849 -> 0 bytes
 .../libs/Bootstrap/js/bootstrap-editable.min.js    |     7 -
 .../libs/Bootstrap/js/bootstrap-notify.min.js      |     1 -
 .../libs/Bootstrap/js/bootstrap-slider.min.js      |    29 -
 .../libs/Bootstrap/js/bootstrap-switch.min.js      |    22 -
 .../resources/libs/Bootstrap/js/bootstrap.min.js   |     7 -
 .../libs/Font-Awesome/css/font-awesome.min.css     |     4 -
 .../libs/Font-Awesome/fonts/FontAwesome.otf        |   Bin 109688 -> 0 bytes
 .../Font-Awesome/fonts/fontawesome-webfont.eot     |   Bin 70807 -> 0 bytes
 .../Font-Awesome/fonts/fontawesome-webfont.svg     |   655 -
 .../Font-Awesome/fonts/fontawesome-webfont.ttf     |   Bin 142072 -> 0 bytes
 .../Font-Awesome/fonts/fontawesome-webfont.woff    |   Bin 83588 -> 0 bytes
 .../Font-Awesome/fonts/fontawesome-webfont.woff2   |   Bin 66624 -> 0 bytes
 .../resources/libs/Underscore/js/Underscore.js     |  1548 --
 .../main/resources/libs/bootbox/js/bootbox.min.js  |     6 -
 .../src/main/resources/libs/d3/js/d3-tip.min.js    |     1 -
 .../storm/src/main/resources/libs/d3/js/d3.min.js  |     5 -
 .../main/resources/libs/dagre-d3/dagre-d3.min.js   |    28 -
 .../resources/libs/jQuery/js/jquery-2.2.3.min.js   |     4 -
 .../src/main/resources/libs/jsx/JSXTransformer.js  | 15201 --------------
 .../views/storm/src/main/resources/libs/jsx/jsx.js |    75 -
 .../src/main/resources/libs/react/js/react-dom.js  |    42 -
 .../resources/libs/react/js/react-with-addons.js   | 20775 -------------------
 .../resources/libs/require-js/js/require.min.js    |    36 -
 .../main/resources/libs/require-text/js/text.js    |   390 -
 .../scripts/collections/BaseCollection.js          |   197 -
 .../scripts/collections/VNimbusConfigList.js       |    52 -
 .../resources/scripts/collections/VNimbusList.js   |    52 -
 .../scripts/collections/VSupervisorList.js         |    52 -
 .../scripts/collections/VTopologyConfigList.js     |    49 -
 .../resources/scripts/collections/VTopologyList.js |    52 -
 .../main/resources/scripts/components/BarChart.jsx |   402 -
 .../resources/scripts/components/Breadcrumbs.jsx   |    50 -
 .../main/resources/scripts/components/Modal.jsx    |    60 -
 .../resources/scripts/components/RadialChart.jsx   |   127 -
 .../resources/scripts/components/SearchLogs.jsx    |    89 -
 .../main/resources/scripts/components/Table.jsx    |   101 -
 .../resources/scripts/components/TopologyGraph.jsx |   199 -
 .../scripts/containers/ClusterSummary.jsx          |   122 -
 .../scripts/containers/NimbusConfigSummary.jsx     |   103 -
 .../resources/scripts/containers/NimbusSummary.jsx |   139 -
 .../scripts/containers/SupervisorSummary.jsx       |   155 -
 .../scripts/containers/TopologyConfiguration.jsx   |    93 -
 .../scripts/containers/TopologyDetailGraph.jsx     |    66 -
 .../scripts/containers/TopologyListing.jsx         |   188 -
 .../views/storm/src/main/resources/scripts/main.js |    98 -
 .../src/main/resources/scripts/models/BaseModel.js |    83 -
 .../src/main/resources/scripts/models/VCluster.js  |    42 -
 .../src/main/resources/scripts/models/VNimbus.js   |    42 -
 .../main/resources/scripts/models/VNimbusConfig.js |    42 -
 .../main/resources/scripts/models/VSupervisor.js   |    42 -
 .../src/main/resources/scripts/models/VTopology.js |    90 -
 .../resources/scripts/models/VTopologyConfig.js    |    34 -
 .../scripts/modules/Table/PageableTable.jsx        |    47 -
 .../resources/scripts/modules/Table/Pagination.jsx |   161 -
 .../src/main/resources/scripts/router/Router.js    |   123 -
 .../src/main/resources/scripts/utils/Globals.js    |    30 -
 .../src/main/resources/scripts/utils/Overrides.js  |    30 -
 .../src/main/resources/scripts/utils/Utils.js      |   113 -
 .../scripts/views/ComponentDetailView.jsx          |   534 -
 .../src/main/resources/scripts/views/Dashboard.jsx |    65 -
 .../src/main/resources/scripts/views/Footer.jsx    |    48 -
 .../resources/scripts/views/NimbusSummaryView.jsx  |    65 -
 .../main/resources/scripts/views/ProfilingView.jsx |   214 -
 .../main/resources/scripts/views/RebalanceView.jsx |   223 -
 .../scripts/views/SupervisorSummaryView.jsx        |    65 -
 .../resources/scripts/views/TopologyDetailView.jsx |  1039 -
 .../scripts/views/TopologyListingView.jsx          |    65 -
 .../storm/src/main/resources/styles/style.css      |   579 -
 contrib/views/storm/src/main/resources/ui/.babelrc |    25 +
 .../storm/src/main/resources/ui/.eslintignore.js   |     3 +
 .../views/storm/src/main/resources/ui/.eslintrc.js |    58 +
 .../storm/src/main/resources/ui/app/scripts/app.js |    40 +
 .../ui/app/scripts/components/BarChart.jsx         |   429 +
 .../ui/app/scripts/components/Breadcrumbs.jsx      |    45 +
 .../ui/app/scripts/components/CommonExpanded.jsx   |    30 +
 .../app/scripts/components/CommonNotification.jsx  |    69 +
 .../ui/app/scripts/components/CommonPagination.jsx |    56 +
 .../scripts/components/CommonSwitchComponent.jsx   |    41 +
 .../app/scripts/components/CommonWindowPanel.jsx   |    99 +
 .../scripts/components/CustomToastContainer.jsx    |    41 +
 .../ui/app/scripts/components/Editable.jsx         |   127 +
 .../ui/app/scripts/components/FSModel.jsx          |   149 +
 .../ui/app/scripts/components/FSReactToastr.jsx    |    37 +
 .../resources/ui/app/scripts/components/Footer.jsx |    28 +
 .../app/scripts/components/LogLevelComponent.jsx   |   236 +
 .../ui/app/scripts/components/ProfilingView.jsx    |   168 +
 .../ui/app/scripts/components/RadialChart.jsx      |   134 +
 .../app/scripts/components/RebalanceTopology.jsx   |   152 +
 .../ui/app/scripts/components/SearchLogs.jsx       |    84 +
 .../ui/app/scripts/components/TopologyGraph.jsx    |   208 +
 .../ui/app/scripts/containers/BaseContainer.jsx    |    50 +
 .../ui/app/scripts/containers/ClusterSummary.jsx   |   125 +
 .../app/scripts/containers/ComponentDetailView.jsx |   714 +
 .../ui/app/scripts/containers/Dashboard.jsx        |    52 +
 .../app/scripts/containers/NimbusConfigSummary.jsx |   126 +
 .../ui/app/scripts/containers/NimbusSummary.jsx    |   150 +
 .../app/scripts/containers/SupervisorSummary.jsx   |   165 +
 .../app/scripts/containers/TopologyDetailView.jsx  |   862 +
 .../ui/app/scripts/containers/TopologyListing.jsx  |   222 +
 .../src/main/resources/ui/app/scripts/main.js      |    46 +
 .../resources/ui/app/scripts/rest/TopologyREST.js  |   118 +
 .../resources/ui/app/scripts/routers/routes.jsx    |    68 +
 .../resources/ui/app/scripts/utils/Constants.js    |    45 +
 .../main/resources/ui/app/scripts/utils/Utils.js   |    51 +
 .../main/resources/ui/app/styles/css/bootstrap.css |  6757 ++++++
 .../ui/app/styles/css/font-awesome.min.css         |     4 +
 .../src/main/resources/ui/app/styles/css/style.css |   836 +
 .../resources/ui/app/styles/css/toastr.min.css     |     1 +
 .../ui/app/styles/fonts/fontawesome-webfont.eot    |   Bin 0 -> 76518 bytes
 .../ui/app/styles/fonts/fontawesome-webfont.svg    |   685 +
 .../ui/app/styles/fonts/fontawesome-webfont.ttf    |   Bin 0 -> 152796 bytes
 .../ui/app/styles/fonts/fontawesome-webfont.woff   |   Bin 0 -> 90412 bytes
 .../ui/app/styles/fonts/fontawesome-webfont.woff2  |   Bin 0 -> 71896 bytes
 .../styles}/fonts/glyphicons-halflings-regular.eot |   Bin
 .../styles/fonts/glyphicons-halflings-regular.svg  |   288 +
 .../styles}/fonts/glyphicons-halflings-regular.ttf |   Bin
 .../fonts/glyphicons-halflings-regular.woff        |   Bin
 .../fonts/glyphicons-halflings-regular.woff2       |   Bin
 .../{images => ui/app/styles/img}/icon-bolt.png    |   Bin
 .../{images => ui/app/styles/img}/icon-spout.png   |   Bin
 .../{images => ui/app/styles/img}/loader.gif       |   Bin
 .../resources/ui/config/webpack.config.base.js     |   101 +
 .../ui/config/webpack.config.development.js        |    64 +
 .../ui/config/webpack.config.production.js         |   131 +
 .../storm/src/main/resources/ui/dev-server.js      |   101 +
 .../views/storm/src/main/resources/ui/index.html   |    47 +
 .../views/storm/src/main/resources/ui/package.json |   110 +
 .../org/apache/ambari/view/utils/hdfs/HdfsApi.java |    16 +-
 .../apache/ambari/view/utils/hdfs/HdfsUtil.java    |    17 +-
 .../resources/ui/app/domain/workflow-importer.js   |     3 +-
 docs/pom.xml                                       |    83 +-
 pom.xml                                            |     7 +-
 1436 files changed, 74212 insertions(+), 80253 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
"commits@ambari.apache.org" <co...@ambari.apache.org>.