Merge branch 'trunk' into branch-feature-AMBARI-20859
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ac5008da Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ac5008da Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ac5008da Branch: refs/heads/branch-feature-AMBARI-20859 Commit: ac5008dac895e39f0257659a270d3b231c0aee9c Parents: b533387 45a2990 Author: Robert Levas <[email protected]> Authored: Thu Jun 22 13:27:41 2017 -0400 Committer: Robert Levas <[email protected]> Committed: Thu Jun 22 13:27:41 2017 -0400 ---------------------------------------------------------------------- .../ambari_server/dbConfiguration_linux.py | 34 +++++++++++++------- 1 file changed, 22 insertions(+), 12 deletions(-) ----------------------------------------------------------------------
