summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCsaba Henk <csaba@redhat.com>2012-07-30 14:48:08 +0200
committerAnand Avati <avati@redhat.com>2012-07-30 11:18:20 -0700
commit224227ef6612680b191bef143b75c7929f9a4c34 (patch)
tree56c2de8be0d0c816b019dc71529e2c72b3d85f3b
parent9181871ff49a5b1e5b1acc9c8a96c99d28e80a5e (diff)
geo-rep / gsycnd: restore the generic signature for sendmark_regular
Earlier fixes to 842330 changed the generic (*a, **kw) signature, although that was not related to the issue. We restore the generic signature as it was used for a reason (proxy methods that do none or only algebraic transformations on passed arguments idiomatically have generic signature, both to serve as visual cue and agnosticism wrt. the inner API). Change-Id: Ib609a3a58be53d78b7f1221a3c162c6aec8fd488 BUG: 842330 Signed-off-by: Csaba Henk <csaba@redhat.com> Reviewed-on: http://review.gluster.com/3754 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Anand Avati <avati@redhat.com>
-rw-r--r--xlators/features/marker/utils/syncdaemon/master.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/xlators/features/marker/utils/syncdaemon/master.py b/xlators/features/marker/utils/syncdaemon/master.py
index 93013912e6a..336f5920711 100644
--- a/xlators/features/marker/utils/syncdaemon/master.py
+++ b/xlators/features/marker/utils/syncdaemon/master.py
@@ -301,12 +301,12 @@ class BlindMixin(object):
class SendmarkNormalMixin(object):
- def sendmark_regular(self, a, *kw):
- return self.sendmark(a, *kw)
+ def sendmark_regular(self, *a, **kw):
+ return self.sendmark(*a, **kw)
class SendmarkRsyncMixin(object):
- def sendmark_regular(self, a, *kw):
+ def sendmark_regular(self, *a, **kw):
pass