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
..
2017-03-27 16:43:15 -04:00
2017-03-13 13:42:43 -04:00
2017-03-27 16:43:15 -04:00
2016-08-18 13:54:47 -07:00