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

..

install_venv.py

Initial conductor implementation

2013-03-04 23:06:13 +04:00

pip-requires

Use Heat REST API instead of command-line

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

test-requires

Initial conductor implementation

2013-03-04 23:06:13 +04:00

with_venv.sh

Fixed: changed the run mode for install venv script

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