Repository: ambari
Updated Branches:
refs/heads/branch-2.1.1 199345942 -> a0a12912c
AMBARI-6965: JDK download URLs in ambari.properties need to be parameterized
(jluniya)
Conflicts:
ambari-server/src/test/python/TestAmbariServer.py
Project: http://git-wip-us.apache.org/repos/asf/amb
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 670e23c40 -> 85d87e55d
AMBARI-6965: JDK download URLs in ambari.properties need to be parameterized
(jluniya)
Conflicts:
ambari-server/src/test/python/TestAmbariServer.py
Project: http://git-wip-us.apache.org/repos/asf/ambar
Repository: ambari
Updated Branches:
refs/heads/trunk 25ee58743 -> 677e233c7
AMBARI-6965: JDK download URLs in ambari.properties need to be parameterized
(jluniya)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/677e233