Merge branch 'master' into invalid-pidfile

2025-01-31 16:36:20 +00:00 · 2017-08-24 18:40:00 +02:00 · 2017-08-24 18:40:00 +02:00 · 89bacbb70a
commit 89bacbb70a
parent 46305c74e1 5483c86d2b
1 changed files with 0 additions and 1 deletions
--- a/src/allmydata/test/cli/test_cli.py
+++ b/src/allmydata/test/cli/test_cli.py
@ -1291,7 +1291,6 @@ class Options(ReallyEqualMixin, unittest.TestCase):
        self.failUnlessRaises(usage.UsageError, self.parse,
                              ["start", "--basedir=here", "--nodaemon"])

-
 class StartStop(unittest.TestCase):

    @staticmethod