Stan Lagun ad0e834457 Merge branch 'master' into conductor-openstack-style ...

Conflicts:
	conductor/bin/app.py
	conductor/conductor/app.py
	conductor/conductor/commands/cloud_formation.py
	conductor/conductor/commands/windows_agent.py
	conductor/conductor/rabbitmq.py
	conductor/conductor/windows_agent.py

2013-03-26 14:46:09 +04:00

..

bin

Fixed all pep8.

2013-03-26 06:35:35 +07:00

conductor

Merge branch 'master' into conductor-openstack-style

2013-03-26 14:46:09 +04:00

data

Merge branch 'master' into conductor-openstack-style

2013-03-26 14:46:09 +04:00

doc/source

Added support for setup.py

2013-03-26 14:38:05 +04:00

etc

Use Heat REST API instead of command-line

2013-03-26 14:42:30 +04:00

logs

Issues #195 and #199

2013-03-21 13:23:18 +04:00

tools

Merge branch 'master' into conductor-openstack-style

2013-03-26 14:46:09 +04:00

.gitignore

Added support for setup.py

2013-03-26 14:38:05 +04:00

babel.cfg

Added support for setup.py

2013-03-26 14:38:05 +04:00

openstack-common.conf

Issues #195 and #199

2013-03-21 13:23:18 +04:00

setup.cfg

Added support for setup.py

2013-03-26 14:38:05 +04:00

setup.py

Added support for setup.py

2013-03-26 14:38:05 +04:00

test.json

Use Heat REST API instead of command-line

2013-03-26 14:42:30 +04:00