Suggest the use of tripelO images

Change-Id: I8dfb18fe3f52baea99ed34cc271241b8e24c8104
Add resource_data table for free-form key/value data.

This can be used to store arbitrary resource-specific data, such as
SSH keys.

Blueprint resource-data.

Change-Id: Ic148bd131f528a676904c8f37fd6deb936917152
Create implicit depends from gateway to public subnet.

Depend on any subnet in this template with the same network_id
as this network_id, as the gateway implicitly creates a port
on that subnet.

Fixes bug: #1195599

Change-Id: Ie850a82dce551d46341b1eef7f0208074b72453f
Merge "Create implicit depends from gateway to public subnet."
Cleanup and make HACKING.rst DRYer

Reference the OpenStack hacking guide in HACKING.rst and remove
duplicate entries.  Add placeholder section for heat specific
rules.  heat specific rules can be created using hacking's local check
support.

Change-Id: Ib6967ae769bd73857abb7ef89368c407c8b22053
Merge "Suggest the use of tripelO images"
Merge "Cleanup and make HACKING.rst DRYer"
Align OpenStack client versions with project requirements.

This brings heat into line with the consensus on how to specify
version range caps.

Fixes bug: #1200214

Change-Id: I14affc96c44f865fdd0516c1eb4eb59f1a808b82
Merge "Add resource_data table for free-form key/value data."
Merge "Align OpenStack client versions with project requirements."
Merge remote branch 'upstream/master' into cloud-server

Conflicts:
	heat/tests/test_sqlalchemy_api.py

Change-Id: I51a6364b09834bd021d8d38ee5fed8a9ced5078d