Merge branch 'trunk' into branch-feature-AMBARI-12556
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/138aa48f
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/138aa48f
Diff:
Merge branch 'trunk' into branch-feature-AMBARI-12556
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/13d806b8
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/13d806b8
Diff:
http://git-wip-us.apache.org/repos/asf/ambari/blob/70c23bcd/ambari-server/src/main/java/org/apache/ambari/server/checks/AbstractCheckDescriptor.java
--