##// END OF EJS Templates
merge default into stable
super-admin -
r998:547d5bfb merge stable
parent child Browse files
Show More
@@ -12,5 +12,5 b' done = true'
12
12
13 [release]
13 [release]
14 state = prepared
14 state = prepared
15 version = 4.27.0
15 version = 4.26.0
16
16
@@ -784,7 +784,7 b' self: super: {'
784 };
784 };
785 };
785 };
786 "rhodecode-vcsserver" = super.buildPythonPackage {
786 "rhodecode-vcsserver" = super.buildPythonPackage {
787 name = "rhodecode-vcsserver-4.27.0";
787 name = "rhodecode-vcsserver-4.27.1";
788 buildInputs = [
788 buildInputs = [
789 self."pytest"
789 self."pytest"
790 self."py"
790 self."py"
@@ -21,8 +21,8 b' class RemoteBase(object):'
21 EMPTY_COMMIT = '0' * 40
21 EMPTY_COMMIT = '0' * 40
22
22
23 def _region(self, wire):
23 def _region(self, wire):
24 repo_id = wire.get('repo_id', '')
24 cache_repo_id = wire.get('cache_repo_id', '')
25 cache_namespace_uid = 'cache_repo.{}'.format(repo_id)
25 cache_namespace_uid = 'cache_repo.{}'.format(cache_repo_id)
26 return rc_cache.get_or_create_region('repo_object', cache_namespace_uid)
26 return rc_cache.get_or_create_region('repo_object', cache_namespace_uid)
27
27
28 def _cache_on(self, wire):
28 def _cache_on(self, wire):
@@ -36,9 +36,10 b' class RemoteBase(object):'
36 def vcsserver_invalidate_cache(self, wire, delete):
36 def vcsserver_invalidate_cache(self, wire, delete):
37 from vcsserver.lib import rc_cache
37 from vcsserver.lib import rc_cache
38 repo_id = wire.get('repo_id', '')
38 repo_id = wire.get('repo_id', '')
39 cache_repo_id = wire.get('cache_repo_id', '')
40 cache_namespace_uid = 'cache_repo.{}'.format(cache_repo_id)
39
41
40 if delete:
42 if delete:
41 cache_namespace_uid = 'cache_repo.{}'.format(repo_id)
42 rc_cache.clear_cache_namespace(
43 rc_cache.clear_cache_namespace(
43 'repo_object', cache_namespace_uid, invalidate=True)
44 'repo_object', cache_namespace_uid, invalidate=True)
44
45
General Comments 0
You need to be logged in to leave comments. Login now