Merge remote-tracking branch 'origin/trunk' into origin-trunk
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2ab5badc Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2ab5badc Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2ab5badc Branch: refs/heads/branch-alerts-dev Commit: 2ab5badc1ab721840f1fd92545dd5887677c6877 Parents: 42a5a33 56e022e Author: Oleg Nechiporenko <[email protected]> Authored: Tue Sep 16 18:22:41 2014 +0300 Committer: Oleg Nechiporenko <[email protected]> Committed: Tue Sep 16 18:22:41 2014 +0300 ---------------------------------------------------------------------- .../internal/ConfigGroupResourceProvider.java | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
