]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #17530 from smithfarm/wip-21264
authorNathan Cutler <presnypreklad@gmail.com>
Tue, 6 Mar 2018 14:22:20 +0000 (15:22 +0100)
committerGitHub <noreply@github.com>
Tue, 6 Mar 2018 14:22:20 +0000 (15:22 +0100)
tools: cleanup: rip out ceph-rest-api

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
Reviewed-by: John Spray <john.spray@redhat.com>
1  2 
ceph.spec.in
debian/control
src/pybind/CMakeLists.txt

diff --cc ceph.spec.in
Simple merge
diff --cc debian/control
index 687107872ac6944599b22c68dd4d0359dd3f1871,d654d578797153348c7b9b7d2a7a63dd6da480a9..1e3f88cd815f983f403c6b9213310411c3c794fa
@@@ -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},
Simple merge