diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-11-12 15:47:19 -0500 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-11-12 15:47:19 -0500 |
| commit | 05929147dde2239ee0078359bd62b1ea5a884d86 (patch) | |
| tree | beba880dfd02b64c61a58ae196cfdc2cbe4dfa46 /src/lib/Bcfg2/Reporting/utils.py | |
| parent | 2b6824857c4ab80e3e791edf82aee3e75e037316 (diff) | |
| parent | 30882ba70ad627f89ab89af6ffc77cda08de8773 (diff) | |
| download | bcfg2-05929147dde2239ee0078359bd62b1ea5a884d86.tar.gz bcfg2-05929147dde2239ee0078359bd62b1ea5a884d86.tar.bz2 bcfg2-05929147dde2239ee0078359bd62b1ea5a884d86.zip | |
Merge branch 'maint'
Conflicts:
src/lib/Bcfg2/Server/Admin/Reports.py
src/lib/Bcfg2/Server/Hostbase/hostbase/urls.py
src/lib/Bcfg2/Server/Hostbase/urls.py
src/sbin/bcfg2-crypt
tools/upgrade/1.3/migrate_dbstats.py
Diffstat (limited to 'src/lib/Bcfg2/Reporting/utils.py')
| -rwxr-xr-x | src/lib/Bcfg2/Reporting/utils.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/Bcfg2/Reporting/utils.py b/src/lib/Bcfg2/Reporting/utils.py index 619501d8b..d9b8213b1 100755 --- a/src/lib/Bcfg2/Reporting/utils.py +++ b/src/lib/Bcfg2/Reporting/utils.py @@ -1,5 +1,5 @@ """Helper functions for reports""" -from django.conf.urls.defaults import * +from Bcfg2.Reporting.Compat.django_urls import * import re """List of filters provided by filteredUrls""" |