James Slagle 54d3b73bab Merge branch 'discovery-dhcp' of https://github.com/marios/instack-undercloud into marios-discovery-dhcp ... Conflicts: json-files/fedora-20-undercloud-delorean.json json-files/fedora-20-undercloud-source.json		2014-09-18 18:21:11 -04:00
..
fedora-20-undercloud-delorean.json	Merge branch 'discovery-dhcp' of https://github.com/marios/instack-undercloud into marios-discovery-dhcp	2014-09-18 18:21:11 -04:00
fedora-20-undercloud-packages.json	Add horizon element to install and needed patch for workaround	2014-08-25 16:45:07 -04:00
fedora-20-undercloud-source.json	Merge branch 'discovery-dhcp' of https://github.com/marios/instack-undercloud into marios-discovery-dhcp	2014-09-18 18:21:11 -04:00
rhel-7-undercloud-source.json	Add initial rhel-7-undercloud-source json file	2014-09-16 16:15:49 -04:00