From: Nathan Cutler <presnypreklad@gmail.com>
Date: Tue, 6 Mar 2018 14:22:20 +0000 (+0100)
Subject: Merge pull request #17530 from smithfarm/wip-21264
X-Git-Tag: v13.0.2~80
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=233fe8338ef9c2a69f2dc592991a8dc7b5174a2c;p=ceph.git

Merge pull request #17530 from smithfarm/wip-21264

tools: cleanup: rip out ceph-rest-api

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
Reviewed-by: John Spray <john.spray@redhat.com>
---

233fe8338ef9c2a69f2dc592991a8dc7b5174a2c
diff --cc debian/control
index 687107872ac,d654d578797..1e3f88cd815
--- a/debian/control
+++ b/debian/control
@@@ -51,12 -51,8 +51,11 @@@ Build-Depends: bc
                 python (>= 2.7),
                 python-all-dev,
                 python-cherrypy3,
-                python-jinja2,
                 python-nose,
                 python-pecan,
 +               python-bcrypt,
 +               python-tox,
 +               python-coverage,
                 python-prettytable,
                 python-setuptools,
                 python-sphinx,
@@@ -174,9 -170,9 +173,10 @@@ Package: ceph-mg
  Architecture: linux-any
  Depends: ceph-base (= ${binary:Version}),
           python-cherrypy3,
+          python-jinja2,
           python-openssl,
           python-pecan,
 +         python-bcrypt,
           python-werkzeug,
           ${misc:Depends},
           ${python:Depends},