Thijs Metsch 67a59a84b4 merge with master

2012-06-26 20:35:55 +02:00

..

compute

merge with master

2012-06-26 20:35:55 +02:00

extensions

merge with master

2012-06-26 20:35:55 +02:00

network

added OCCI OS api

2012-06-26 18:17:43 +02:00

storage

added OCCI OS api

2012-06-26 18:17:43 +02:00

__init__.py

merge with master

2012-06-26 20:35:55 +02:00

registry.py

merge with master

2012-06-26 20:35:55 +02:00

wsgi.py

added OCCI OS api

2012-06-26 18:17:43 +02:00