Merge lp://qastaging/~chris.macnaughton/openstack-mojo-specs/deploy-timeouts into lp://qastaging/openstack-mojo-specs

helper/template/dev/manifest (+1/-1)
specs/deprecated/next_ha_phased/icehouse/manifest (+2/-2)
specs/deprecated/next_ha_phased/kilo/manifest (+2/-2)
specs/deprecated/next_ha_phased/liberty/manifest (+2/-2)
specs/deprecated/next_ha_phased_chaos_pony/icehouse/manifest (+2/-2)
specs/deprecated/next_ha_phased_chaos_pony/kilo/manifest (+2/-2)
specs/deprecated/next_ha_phased_chaos_pony/liberty/manifest (+2/-2)
specs/deprecated/swift_proxy_ha_parallel_scaleout/icehouse/manifest (+2/-2)
specs/deprecated/swift_proxy_ha_parallel_scaleout/kilo/manifest (+2/-2)
specs/deprecated/swift_proxy_ha_parallel_scaleout/liberty/manifest (+2/-2)
specs/deprecated/swift_proxy_ha_parallel_scaleout/mitaka/manifest (+2/-2)
specs/deprecated/swift_proxy_ha_parallel_scaleout/newton/manifest (+2/-2)
specs/dev/bug1389670/mysql/manifest (+1/-1)
specs/dev/bug1389670/percona_cluster/manifest (+1/-1)
specs/dev/dvr/manifest (+1/-1)
specs/dev/full_nrpe/manifest (+1/-1)
specs/dev/gluster/default/3.7/manifest (+1/-1)
specs/dev/haproxy_always/manifest (+1/-1)
specs/dev/keystone_ssl/manifest (+1/-1)
specs/dev/magpie/manifest (+1/-1)
specs/dev/magpie_baremetal/manifest (+1/-1)
specs/dev/magpie_lxc_baremetal/manifest (+1/-1)
specs/dev/multicast_port_change/manifest (+2/-2)
specs/dev/neutron_ha/manifest (+1/-1)
specs/dev/next_mini/icehouse/manifest (+1/-1)
specs/dev/next_mini/liberty/manifest (+1/-1)
specs/dev/nova_cc_legacy_neutron/manifest (+1/-1)
specs/dev/novaccalch/manifest (+1/-1)
specs/dev/stable_mini/icehouse/manifest (+1/-1)
specs/dev/stable_mini/liberty/manifest (+1/-1)
specs/dev/swift_nrpe/simple_nonha/manifest (+1/-1)
specs/dev/vxlan/manifest (+1/-1)
specs/full_stack/next_charmhelper_sync/icehouse/manifest (+1/-1)
specs/full_stack/next_charmhelper_sync/kilo/manifest (+1/-1)
specs/full_stack/next_charmhelper_sync/liberty/manifest (+1/-1)
specs/full_stack/next_charmhelper_sync/mitaka/manifest (+1/-1)
specs/full_stack/next_charmhelper_sync/newton/manifest (+1/-1)
specs/full_stack/next_charmhelper_sync/ocata/manifest (+1/-1)
specs/full_stack/next_charmhelper_sync/pike/manifest (+1/-1)
specs/full_stack/next_charmhelper_sync_ha/icehouse/manifest (+2/-2)
specs/full_stack/next_charmhelper_sync_ha/kilo/manifest (+2/-2)
specs/full_stack/next_charmhelper_sync_ha/liberty/manifest (+2/-2)
specs/full_stack/next_deploy/icehouse/manifest (+1/-1)
specs/full_stack/next_deploy/kilo/manifest (+1/-1)
specs/full_stack/next_deploy/liberty/manifest (+1/-1)
specs/full_stack/next_deploy/mitaka/manifest (+1/-1)
specs/full_stack/next_deploy/newton/manifest (+1/-1)
specs/full_stack/next_deploy/ocata/manifest (+1/-1)
specs/full_stack/next_deploy/pike/manifest (+1/-1)
specs/full_stack/next_deploy_baremetal/icehouse/manifest (+2/-2)
specs/full_stack/next_deploy_baremetal/kilo/manifest (+2/-2)
specs/full_stack/next_deploy_baremetal/liberty/manifest (+2/-2)
specs/full_stack/next_deploy_baremetal/mitaka/manifest (+2/-2)
specs/full_stack/next_deploy_baremetal/newton/manifest (+2/-2)
specs/full_stack/next_deploy_baremetal/ocata/manifest (+2/-2)
specs/full_stack/next_deploy_designate/mitaka/manifest (+1/-1)
specs/full_stack/next_deploy_designate/newton/manifest (+1/-1)
specs/full_stack/next_deploy_designate/ocata/manifest (+1/-1)
specs/full_stack/next_deploy_designate/pike/manifest (+1/-1)
specs/full_stack/next_deploy_ssl/icehouse/manifest (+1/-1)
specs/full_stack/next_deploy_ssl/kilo/manifest (+1/-1)
specs/full_stack/next_deploy_ssl/liberty/manifest (+1/-1)
specs/full_stack/next_deploy_ssl/mitaka/manifest (+1/-1)
specs/full_stack/next_deploy_ssl/newton/manifest (+1/-1)
specs/full_stack/next_deploy_ssl/ocata/manifest (+1/-1)
specs/full_stack/next_deploy_ssl/pike/manifest (+1/-1)
specs/full_stack/next_dvr/kilo/manifest (+1/-1)
specs/full_stack/next_dvr/liberty/manifest (+1/-1)
specs/full_stack/next_dvr/mitaka/manifest (+1/-1)
specs/full_stack/next_dvr/newton/manifest (+1/-1)
specs/full_stack/next_dvr/ocata/manifest (+1/-1)
specs/full_stack/next_dvr/pike/manifest (+1/-1)
specs/full_stack/next_ha_oneshot/icehouse/manifest (+1/-1)
specs/full_stack/next_ha_oneshot/kilo/manifest (+1/-1)
specs/full_stack/next_ha_oneshot/liberty/manifest (+1/-1)
specs/full_stack/next_ha_oneshot/mitaka/manifest (+1/-1)
specs/full_stack/next_ha_oneshot/newton/manifest (+1/-1)
specs/full_stack/next_ha_oneshot/ocata/manifest (+1/-1)
specs/full_stack/next_ha_oneshot/pike/manifest (+1/-1)
specs/full_stack/next_ha_vrrp/kilo/manifest (+1/-1)
specs/full_stack/next_ha_vrrp/liberty/manifest (+1/-1)
specs/full_stack/next_ha_vrrp/mitaka/manifest (+1/-1)
specs/full_stack/next_ha_vrrp/newton/manifest (+1/-1)
specs/full_stack/next_ha_vrrp/ocata/manifest (+1/-1)
specs/full_stack/next_ha_vrrp/pike/manifest (+1/-1)
specs/full_stack/next_keystone_v3/liberty/manifest (+1/-1)
specs/full_stack/next_keystone_v3/mitaka/manifest (+1/-1)
specs/full_stack/next_keystone_v3/newton/manifest (+1/-1)
specs/full_stack/next_keystone_v3/ocata/manifest (+1/-1)
specs/full_stack/next_keystone_v3/pike/manifest (+1/-1)
specs/full_stack/next_openstack_upgrade/icehouse/manifest (+1/-1)
specs/full_stack/next_openstack_upgrade/kilo/manifest (+1/-1)
specs/full_stack/next_openstack_upgrade/liberty/manifest (+1/-1)
specs/full_stack/next_openstack_upgrade/mitaka/manifest (+1/-1)
specs/full_stack/next_openstack_upgrade/newton/manifest (+1/-1)
specs/full_stack/next_openstack_upgrade/ocata/manifest (+1/-1)
specs/full_stack/odl/liberty/manifest (+1/-1)
specs/full_stack/stable_deploy/icehouse/manifest (+1/-1)
specs/full_stack/stable_deploy/kilo/manifest (+1/-1)
specs/full_stack/stable_deploy/liberty/manifest (+1/-1)
specs/full_stack/stable_deploy/mitaka/manifest (+1/-1)
specs/full_stack/stable_deploy/newton/manifest (+1/-1)
specs/full_stack/stable_deploy/ocata/manifest (+1/-1)
specs/full_stack/stable_deploy/pike/manifest (+1/-1)
specs/full_stack/stable_deploy_baremetal/icehouse/manifest (+2/-2)
specs/full_stack/stable_deploy_baremetal/kilo/manifest (+2/-2)
specs/full_stack/stable_deploy_baremetal/liberty/manifest (+2/-2)
specs/full_stack/stable_deploy_baremetal/mitaka/manifest (+2/-2)
specs/full_stack/stable_deploy_baremetal/newton/manifest (+2/-2)
specs/full_stack/stable_deploy_baremetal/ocata/manifest (+2/-2)
specs/full_stack/stable_deploy_ssl/icehouse/manifest (+1/-1)
specs/full_stack/stable_deploy_ssl/kilo/manifest (+1/-1)
specs/full_stack/stable_deploy_ssl/liberty/manifest (+1/-1)
specs/full_stack/stable_deploy_ssl/mitaka/manifest (+1/-1)
specs/full_stack/stable_deploy_ssl/newton/manifest (+1/-1)
specs/full_stack/stable_deploy_ssl/ocata/manifest (+1/-1)
specs/full_stack/stable_deploy_tempest/newton/manifest (+1/-1)
specs/full_stack/stable_keystone_v3/liberty/manifest (+1/-1)
specs/full_stack/stable_keystone_v3/mitaka/manifest (+1/-1)
specs/full_stack/stable_keystone_v3/newton/manifest (+1/-1)
specs/full_stack/stable_keystone_v3/ocata/manifest (+1/-1)
specs/full_stack/stable_to_next/icehouse/manifest (+1/-1)
specs/full_stack/stable_to_next/kilo/manifest (+1/-1)
specs/full_stack/stable_to_next/liberty/manifest (+1/-1)
specs/full_stack/stable_to_next/mitaka/manifest (+1/-1)
specs/full_stack/stable_to_next/newton/manifest (+1/-1)
specs/full_stack/stable_to_next/ocata/manifest (+1/-1)
specs/full_stack/stable_to_next_ha/icehouse/manifest (+1/-1)
specs/full_stack/stable_to_next_ha/kilo/manifest (+1/-1)
specs/full_stack/stable_to_next_ha/liberty/manifest (+1/-1)
specs/full_stack/stable_to_next_ha/mitaka/manifest (+1/-1)
specs/full_stack/stable_to_next_ha/newton/manifest (+1/-1)
specs/full_stack/stable_to_next_ha/ocata/manifest (+1/-1)
specs/storage/ceph/base/icehouse/manifest (+1/-1)
specs/storage/ceph/base/kilo/manifest (+1/-1)
specs/storage/ceph/base/liberty/manifest (+1/-1)
specs/storage/ceph/base/mitaka/manifest (+1/-1)
specs/storage/ceph/base/newton/manifest (+1/-1)
specs/storage/ceph/base/ocata/manifest (+1/-1)
specs/storage/ceph/base/pike/manifest (+1/-1)
specs/storage/ceph/base/queens/manifest (+1/-1)
specs/storage/ceph/charm_migration/icehouse/manifest (+2/-2)
specs/storage/ceph/charm_migration/kilo/manifest (+2/-2)
specs/storage/ceph/charm_migration/liberty/manifest (+2/-2)
specs/storage/ceph/charm_migration/mitaka/manifest (+2/-2)
specs/storage/ceph/charm_migration/newton/manifest (+2/-2)
specs/storage/ceph/charm_migration/ocata/manifest (+2/-2)
specs/storage/ceph/charm_migration/pike/manifest (+2/-2)
specs/storage/ceph/encrypt/icehouse/manifest (+1/-1)
specs/storage/ceph/encrypt/kilo/manifest (+1/-1)
specs/storage/ceph/encrypt/liberty/manifest (+1/-1)
specs/storage/ceph/encrypt/mitaka/manifest (+1/-1)
specs/storage/ceph/encrypt/newton/manifest (+1/-1)
specs/storage/ceph/encrypt/ocata/manifest (+1/-1)
specs/storage/ceph/encrypt/pike/manifest (+1/-1)
specs/storage/ceph/harden/icehouse/manifest (+1/-1)
specs/storage/ceph/harden/kilo/manifest (+1/-1)
specs/storage/ceph/harden/liberty/manifest (+1/-1)
specs/storage/ceph/harden/mitaka/manifest (+1/-1)
specs/storage/ceph/harden/newton/manifest (+1/-1)
specs/storage/ceph/harden/ocata/manifest (+1/-1)
specs/storage/ceph/harden/pike/manifest (+1/-1)
specs/storage/ceph/radosgw/icehouse/manifest (+1/-1)
specs/storage/ceph/radosgw/kilo/manifest (+1/-1)
specs/storage/ceph/radosgw/liberty/manifest (+1/-1)
specs/storage/ceph/radosgw/mitaka/manifest (+1/-1)
specs/storage/ceph/radosgw/newton/manifest (+1/-1)
specs/storage/ceph/radosgw/ocata/manifest (+1/-1)
specs/storage/ceph/radosgw/pike/manifest (+1/-1)
specs/storage/ceph/radosgw_ha/icehouse/manifest (+1/-1)
specs/storage/ceph/radosgw_ha/kilo/manifest (+1/-1)
specs/storage/ceph/radosgw_ha/liberty/manifest (+1/-1)
specs/storage/ceph/radosgw_ha/mitaka/manifest (+1/-1)
specs/storage/ceph/radosgw_ha/newton/manifest (+1/-1)
specs/storage/ceph/radosgw_ha/ocata/manifest (+1/-1)
specs/storage/ceph/radosgw_ha/pike/manifest (+1/-1)
specs/storage/swift/base/icehouse/manifest (+1/-1)
specs/storage/swift/base/kilo/manifest (+1/-1)
specs/storage/swift/base/liberty/manifest (+1/-1)
specs/storage/swift/base/mitaka/manifest (+1/-1)
specs/storage/swift/base/newton/manifest (+1/-1)
specs/storage/swift/base/ocata/manifest (+1/-1)
specs/storage/swift/base/pike/manifest (+1/-1)
specs/storage/swift/ha_serial_scaleout/icehouse/manifest (+1/-1)
specs/storage/swift/ha_serial_scaleout/kilo/manifest (+1/-1)
specs/storage/swift/ha_serial_scaleout/liberty/manifest (+1/-1)
specs/storage/swift/ha_serial_scaleout/mitaka/manifest (+1/-1)
specs/storage/swift/ha_serial_scaleout/newton/manifest (+1/-1)
specs/storage/swift/ha_serial_scaleout/ocata/manifest (+1/-1)
specs/storage/swift/ha_serial_scaleout/pike/manifest (+1/-1)