commit da04d6fa947170110af7e68d84b2cf02937faf94
author Srikanth Vavilapalli <srikanth.vavilapalli@ericsson.com> Thu Mar 24 00:27:29 2016 -0400
committer Srikanth Vavilapalli <srikanth.vavilapalli@ericsson.com> Thu Mar 24 00:27:29 2016 -0400
tree 37fed594bffe7f4b701f0d7d70fcd213b4987dd8
parent df602801e648722c713b08f399a785cfe17161be
parent c64fd34ab58b4a7d8dacff588fe77aadec3c6743

Merge branch 'ceilometer_compressed_image' of https://github.com/open-cloud/xos into ceilometer_compressed_image

xos/synchronizers/base/syncstep.py

diff --git a/xos/synchronizers/base/syncstep.py b/xos/synchronizers/base/syncstep.py
index 54c4b89..e6b8d55 100644
--- a/xos/synchronizers/base/syncstep.py
+++ b/xos/synchronizers/base/syncstep.py
@@ -227,8 +227,9 @@
                         self.delete_record(o)
                         o.delete(purge=True)
                     else:
+                        new_enacted = datetime.now() # Is this the same timezone? XXX
                         self.sync_record(o)
-                        o.enacted = datetime.now() # Is this the same timezone? XXX
+                        o.enacted = new_enacted
                         scratchpad = {'next_run':0, 'exponent':0, 'last_success':time.time()}
                         o.backend_register = json.dumps(scratchpad)
                         o.backend_status = "1 - OK"

xos/synchronizers/model_policy.py

diff --git a/xos/synchronizers/model_policy.py b/xos/synchronizers/model_policy.py
index b8fdd5d..d0bbbb1 100644
--- a/xos/synchronizers/model_policy.py
+++ b/xos/synchronizers/model_policy.py
@@ -52,7 +52,7 @@
     return
 
 
-@atomic
+#@atomic
 def execute_model_policy(instance, deleted):
     # Automatic dirtying
     if (instance in bad_instances):