tree c53d365f39a00d416c17c726970be375d8259a7f
parent 20de8528a6880f90b90e3125a9251321025bec06
parent 5891bd868a3ed727dad29e50e0490f2220839a91
author Simon Pasquier <spasquier@mirantis.com> 1479466005 +0100
committer Simon Pasquier <spasquier@mirantis.com> 1479466019 +0100

Merge remote-tracking branch 'upstream/master' into merge-branch

Conflicts:
	metadata/service/support.yml

Change-Id: Icc8a1c0085cac1209b333cfad40917d57edafcf9