diff --git a/VERSION b/VERSION index 3a8cf3d9..2361e701 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.1.0 (2012-10-08 11:03:17) dev +Version 2.1.0 (2012-10-08 12:08:55) dev diff --git a/gluon/contrib/memcache/__init__.py b/gluon/contrib/memcache/__init__.py index 68900695..e1828023 100644 --- a/gluon/contrib/memcache/__init__.py +++ b/gluon/contrib/memcache/__init__.py @@ -29,7 +29,7 @@ class MemcacheClientObj(Client): pload=None, pid=None, default_time_expire = DEFAULT_TIME_EXPIRE): self.request=request - self.default_time_expire = time_expire + self.default_time_expire = default_time_expire if request: app = request.application else: