]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'debian-stretch-dep-fix' of git://github.com/rldleblanc/ceph
authorSage Weil <sage@redhat.com>
Fri, 11 Mar 2016 16:14:18 +0000 (11:14 -0500)
committerSage Weil <sage@redhat.com>
Fri, 11 Mar 2016 16:14:18 +0000 (11:14 -0500)
Reviewed-by: Sage Weil <sage@redhat.com>
# Conflicts:
# debian/control

1  2 
debian/control

diff --cc debian/control
index 899a9356c6f61d0bfd33a88599cc7e938dcd203d,9918762b1cf6023c95edd5ffe643d44b98d34c0d..bb17fe5e9a04dca780bf33c2a5a7de4d3c2ddd8f
@@@ -87,13 -75,12 +87,13 @@@ Depends: binutils
           gdisk,
           grep,
           logrotate,
 +         lsb-release,
           parted,
           python,
-          python-argparse,
+          python-argparse | libpython2.7-stdlib,
 +         python-pkg-resources,
           sdparm | hdparm,
           xfsprogs,
 -       python-flask,
           ${misc:Depends},
           ${shlibs:Depends}
  Recommends: btrfs-tools, ceph-mds, librados2, libradosstriper1, librbd1