Merge remote-tracking branch 'origin/apache-ref/branch-2.4' into 2.4.0-maint
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/160229e5 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/160229e5 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/160229e5 Branch: refs/heads/2.4.0-maint Commit: 160229e50447b2b194e3fd84bc0865207afe29c9 Parents: 41b51eb e349cd9 Author: Jenkins <[email protected]> Authored: Wed Aug 17 10:25:54 2016 +0000 Committer: Jenkins <[email protected]> Committed: Wed Aug 17 10:25:54 2016 +0000 ---------------------------------------------------------------------- .../internal/ComponentResourceProvider.java | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) ----------------------------------------------------------------------
