| commit | 4b1266e10964b244b5e7473e9a14421aee8590fd | [log] [tgz] |
|---|---|---|
| author | Jenkins <jenkins@review.openstack.org> | Thu Feb 13 20:02:27 2014 +0000 |
| committer | Gerrit Code Review <review@openstack.org> | Thu Feb 13 20:02:27 2014 +0000 |
| tree | 9161805529586b10197940525ebd7d6554f6288b | |
| parent | 7817f7a1e5acb404ff49f2dde5caa0acfd4261ff [diff] | |
| parent | 1bcd2800271d6a72237084ad7f36f84072eecd18 [diff] |
Merge "Don't warn about heat modifying flavors"
diff --git a/lib/marconi b/lib/marconi index d1ab5f3..0aaff1b 100644 --- a/lib/marconi +++ b/lib/marconi
@@ -52,7 +52,7 @@ MARCONICLIENT_BRANCH=${MARCONICLIENT_BRANCH:-master} # Tell Tempest this project is present -TEMPEST_SERVICES+=,marconi +TEMPEST_SERVICES+=,marconi-server # Functions