--- a/doc/3.21.rst	Fri Mar 13 14:10:40 2015 +0100
+++ b/doc/3.21.rst	Fri Mar 13 14:12:03 2015 +0100
@@ -17,4 +17,9 @@
 
 * the `Pyro` and `Zmq-pickle` remote repository access methods have
   been entirely removed (emerging alternatives such as rqlcontroller
-  and cwclientlib should be used instead)
+  and cwclientlib should be used instead).  Note that as a side effect,
+  "repository-only" instances (i.e. without a http component) are no
+  longer possible.  If you have any such instances, you will need to
+  rename the configuration file from repository.conf to all-in-one.conf
+  and run ``cubicweb-ctl upgrade`` to update it.
+

--- a/etwist/twctl.py	Fri Mar 13 14:10:40 2015 +0100
+++ b/etwist/twctl.py	Fri Mar 13 14:12:03 2015 +0100
@@ -71,11 +71,14 @@
         cfgname = 'all-in-one'
         subcommand = 'cubicweb-twisted'
 
-    class AllInOneStopHandler(serverctl.RepositoryStopHandler):
+    class AllInOneStopHandler(CommandHandler):
         cmdname = 'stop'
         cfgname = 'all-in-one'
         subcommand = 'cubicweb-twisted'
 
+        def poststop(self):
+            pass
+
     class AllInOneUpgradeHandler(TWUpgradeHandler):
         cfgname = 'all-in-one'
 

--- a/server/serverctl.py	Fri Mar 13 14:10:40 2015 +0100
+++ b/server/serverctl.py	Fri Mar 13 14:12:03 2015 +0100
@@ -295,28 +295,6 @@
                     raise ExecutionError(str(exc))
 
 
-class RepositoryStartHandler(CommandHandler):
-    cmdname = 'start'
-    cfgname = 'repository'
-
-    def start_server(self, config):
-        command = ['cubicweb-ctl', 'start-repository']
-        if config.debugmode:
-            command.append('--debug')
-        command.append('--loglevel')
-        command.append(config['log-threshold'].lower())
-        command.append(config.appid)
-        subprocess.call(command)
-        return 1
-
-
-class RepositoryStopHandler(CommandHandler):
-    cmdname = 'stop'
-    cfgname = 'repository'
-
-    def poststop(self):
-        pass
-
 # repository specific commands ################################################
 
 def createdb(helper, source, dbcnx, cursor, **kwargs):