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/Server/Admin.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/Server/Admin.py')
| -rw-r--r-- | src/lib/Bcfg2/Server/Admin.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/Bcfg2/Server/Admin.py b/src/lib/Bcfg2/Server/Admin.py index 6a56657cf..207106596 100644 --- a/src/lib/Bcfg2/Server/Admin.py +++ b/src/lib/Bcfg2/Server/Admin.py @@ -912,8 +912,8 @@ if HAS_REPORTS: # Bcfg2.DBSettings has been populated, Django gets a null # configuration, and subsequent updates to # Bcfg2.DBSettings won't help. - from django.db.transaction import commit_on_success - self.run = commit_on_success(self.run) + from Bcfg2.Reporting.Compat import transaction + self.run = transaction.atomic(self.run) def run(self, _): # pylint: disable=E0202 # Cleanup unused entries |