# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 1493925842 -7200
# Node ID 77c184c80e3ef27b10f590222034daa6f312ce83
# Parent  d72c8c1f09e24ebb12692b45d9a048ce9e909e53# Parent  d49f376598f80f1b37dc451605f850eab7ea733b
merge with stable

diff -r d72c8c1f09e2 -r 77c184c80e3e README
--- a/README	Thu May 04 14:02:30 2017 +0200
+++ b/README	Thu May 04 21:24:02 2017 +0200
@@ -112,6 +112,11 @@
 Changelog
 =========
 
+6.1.1 - in progress
+-------------------
+
+ - also enable the new cache (from 6.1.0) for 'evolve.server-only',
+
 6.1.0 -- 2017-05-03
 -------------------
 
diff -r d72c8c1f09e2 -r 77c184c80e3e hgext3rd/evolve/serveronly.py
--- a/hgext3rd/evolve/serveronly.py	Thu May 04 14:02:30 2017 +0200
+++ b/hgext3rd/evolve/serveronly.py	Thu May 04 21:24:02 2017 +0200
@@ -17,6 +17,7 @@
     from . import (
         exthelper,
         metadata,
+        obscache,
         obsexchange,
     )
 except ValueError as exc:
@@ -27,6 +28,7 @@
     from evolve import (
         exthelper,
         metadata,
+        obscache,
         obsexchange,
     )
 
@@ -36,6 +38,7 @@
 buglink = metadata.buglink
 
 eh = exthelper.exthelper()
+eh.merge(obscache.eh)
 eh.merge(obsexchange.eh)
 uisetup = eh.final_uisetup
 extsetup = eh.final_extsetup