diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-11-28 19:55:53 -0500 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-11-28 19:55:53 -0500 |
| commit | b2b6c78e3179cef66cd4e9dcea7f9003f409ce8b (patch) | |
| tree | 2355b55efce971b6c7044b1f04b4a3730d2da50f /devel/management/commands/reporead_inotify.py | |
| parent | 0877f0389f187cf2cbf026c73b27071857d3e6f7 (diff) | |
| parent | fab8d437929fce202b11707e1cacbc079f61edbc (diff) | |
Merge tag 'release_2013-11-25' into archweb-generic
Django 1.6 upgrade and other changes
Conflicts:
templates/news/list.html
templates/public/index.html
Diffstat (limited to 'devel/management/commands/reporead_inotify.py')
| -rw-r--r-- | devel/management/commands/reporead_inotify.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/devel/management/commands/reporead_inotify.py b/devel/management/commands/reporead_inotify.py index 6aa4e0e0..e3c720bc 100644 --- a/devel/management/commands/reporead_inotify.py +++ b/devel/management/commands/reporead_inotify.py @@ -66,7 +66,7 @@ class Command(BaseCommand): if hasattr(thread, 'cancel'): thread.cancel() - @transaction.commit_on_success + @transaction.atomic def setup_notifier(self): '''Set up and configure the inotify machinery and logic. This takes the provided or default path_template and builds a list of |