commit 15a4227b192cacc9ca3b80ac69ae13aa41fd2f08
author Sapan Bhatia <gwsapan@gmail.com> Wed Sep 16 17:42:20 2015 +0200
committer Sapan Bhatia <gwsapan@gmail.com> Wed Sep 16 17:42:20 2015 +0200
tree 2f250b949446af06d989a41b225f38dd0d628569
parent d063f5ff3eb7a09a460ab890a5c4c839c5983601
parent f3c8ff2a49dd15c3ca6d7ee233e66b671046965f

Merge branch 'master' of github.com:open-cloud/xos

xos/openstack_observer/syncstep.py

diff --git a/xos/openstack_observer/syncstep.py b/xos/openstack_observer/syncstep.py
index 3759130..7954bb7 100644
--- a/xos/openstack_observer/syncstep.py
+++ b/xos/openstack_observer/syncstep.py
@@ -83,7 +83,7 @@
 	objs = []
 	for main_obj in main_objs:
 		if (not deletion):
-		    lobjs = main_obj.objects.filter(Q(enacted__lt=F('updated')) | Q(enacted=None),Q(lazy_blocked=False,Q(no_sync=False)))
+		    lobjs = main_obj.objects.filter(Q(enacted__lt=F('updated')) | Q(enacted=None),Q(lazy_blocked=False),Q(no_sync=False))
 		else:
 		    lobjs = main_obj.deleted_objects.all()
 	        objs.extend(lobjs)