| commit | d6d5154a39386751c4416adf9e9a22a2753a5c86 | [log] [tgz] |
|---|---|---|
| author | Simon Pasquier <spasquier@mirantis.com> | Fri Nov 18 11:46:45 2016 +0100 |
| committer | Simon Pasquier <spasquier@mirantis.com> | Fri Nov 18 11:46:59 2016 +0100 |
| tree | c53d365f39a00d416c17c726970be375d8259a7f | |
| parent | 20de8528a6880f90b90e3125a9251321025bec06 [diff] | |
| parent | 5891bd868a3ed727dad29e50e0490f2220839a91 [diff] |
Merge remote-tracking branch 'upstream/master' into merge-branch Conflicts: metadata/service/support.yml Change-Id: Icc8a1c0085cac1209b333cfad40917d57edafcf9