diff options
| author | Kevin Vigor <kvigor@fb.com> | 2017-03-05 09:21:11 -0800 |
|---|---|---|
| committer | Kevin Vigor <kvigor@fb.com> | 2017-03-05 09:21:11 -0800 |
| commit | 523a544a58737522866a9c6b8fc3c041a9b0621f (patch) | |
| tree | d7912fa61c5d42f1f7a44a600d95668d1164db92 /geo-replication/syncdaemon/master.py | |
| parent | 59c0315ae35c339e3b36bb7e38da5c0753ab977a (diff) | |
| parent | 19aeb28e73c20a9ded183676c6080dc37515513c (diff) | |
Merge remote-tracking branch 'origin/release-3.8' into merge-3.8
Diffstat (limited to 'geo-replication/syncdaemon/master.py')
| -rw-r--r-- | geo-replication/syncdaemon/master.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/geo-replication/syncdaemon/master.py b/geo-replication/syncdaemon/master.py index b65abf98589..6437dcc4295 100644 --- a/geo-replication/syncdaemon/master.py +++ b/geo-replication/syncdaemon/master.py @@ -149,7 +149,9 @@ class NormalMixin(object): xt = _xtime_now() rsc.server.aggregated.set_xtime(path, self.uuid, xt) else: - xt = opts['default_xtime'] + zero_zero = (0, 0) + if xt != zero_zero: + xt = opts['default_xtime'] return xt def keepalive_payload_hook(self, timo, gap): |