Joshua Hesketh 94f33cb666 Merge branch 'master' into feature/zuulv3 ...

The nodepool_id feature may need to be removed. I've kept it to simplify
merging both now and if we do it again later.

A couple of the tests are disabled and need reworking in a subsquent
commit.

Change-Id: I948f9f69ad911778fabb1c498aebd23acce8c89c

2017-03-30 21:46:15 +11:00

..

files

Use devstack's zookeeper support

2017-03-01 10:17:20 -06:00

plugin.sh

Merge branch 'master' into feature/zuulv3

2017-03-30 21:46:15 +11:00

settings

Merge branch 'master' into feature/zuulv3

2017-03-30 21:46:15 +11:00