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/84e0849b Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/84e0849b Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/84e0849b Branch: refs/heads/trunk Commit: 84e0849b9be21734f0e683c05ac918ce43d4b97d Parents: 712d99e 9f0d9a3 Author: Oleg Nechiporenko <onechipore...@apache.org> Authored: Fri Oct 3 14:02:24 2014 +0300 Committer: Oleg Nechiporenko <onechipore...@apache.org> Committed: Fri Oct 3 14:02:24 2014 +0300 ---------------------------------------------------------------------- .../src/main/resources/stacks/HDP/2.2/services/SLIDER/metainfo.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------
