Removed deprecated warlock-0.4, added warlock-1.0.1 required by python-glanceclient
Merge branch 'master' of https://github.com/pgrandin/openstack-overlay