Sean Dague d15fd0647e make merge conflict changes black
instead of using the red dot to be all fails, use a black dot to
represent a change which has a merge conflict. Then it's clearer
when something it off the subway map, why it is, without having
to mouse over the circle (which few people knew about).

Change-Id: Ia44292fa553538e8924993f92a7177dfae34111f
2014-01-11 19:00:44 -05:00
2014-01-11 19:00:44 -05:00
2012-11-30 20:56:32 +00:00
2012-09-22 17:32:02 +00:00
2013-09-23 18:29:18 +00:00
2013-09-23 18:29:18 +00:00
2013-12-10 08:36:42 -08:00
2012-09-10 15:58:27 +00:00
2013-11-12 11:30:34 -05:00

These are a set of puppet manifests and modules that are currently being used to manage the OpenStack Project infrastructure.

The main entry point is in manifests/site.pp.

In general, most of the modules here are designed to be able to be run either in agent or apply mode.

These puppet modules require puppet 2.7 or greater. Additionally, the site.pp manifest assumes the existence of hiera.

See http://ci.openstack.org for more information.

Description
System configuration for the OpenDev Collaboratory
Readme 154 MiB
Languages
Jinja 37%
Python 36.7%
Shell 13.6%
Dockerfile 3.9%
JavaScript 3%
Other 5.8%