| commit | f9a6bae5a60b94419fe03a2fac44cc65706f47bb | [log] [tgz] |
|---|---|---|
| author | Michael Kutý <6du1ro.n@gmail.com> | Sun Nov 22 21:41:10 2015 +0100 |
| committer | Michael Kutý <6du1ro.n@gmail.com> | Sun Nov 22 21:41:10 2015 +0100 |
| tree | 45a864e5960736a48c07821accdf7cacc7b79fd4 | |
| parent | f999253128dd02582bec90578e7f96dbf9e1cb49 [diff] |
Telemetry not requires custom root urls, and bump version of horizon-contrib
diff --git a/horizon/files/horizon_settings/_local_settings.py b/horizon/files/horizon_settings/_local_settings.py index 75cf860..965f8c5 100644 --- a/horizon/files/horizon_settings/_local_settings.py +++ b/horizon/files/horizon_settings/_local_settings.py
@@ -178,10 +178,6 @@ {%- endif %} -{%- if plugin.app == "horizon_telemetry" %} -AUTHENTICATION_URLS += ['horizon_telemetry.graphite_urls'] -{%- endif %} - {%- if plugin.urls is defined %} AUTHENTICATION_URLS += {{ plugin.urls|python }} {%- endif %}
diff --git a/horizon/files/requirements/helpdesk_vanilla.txt b/horizon/files/requirements/helpdesk_vanilla.txt index 6e3851a..bf40f1b 100644 --- a/horizon/files/requirements/helpdesk_vanilla.txt +++ b/horizon/files/requirements/helpdesk_vanilla.txt
@@ -66,5 +66,5 @@ python-muranoclient>=0.5.5 raven -horizon-contrib>=2015.7.6 +horizon-contrib>=2015.11.6 django-wysiwyg-redactor \ No newline at end of file