From: Sage Weil <sage@redhat.com>
Date: Fri, 11 Mar 2016 16:14:18 +0000 (-0500)
Subject: Merge branch 'debian-stretch-dep-fix' of git://github.com/rldleblanc/ceph
X-Git-Tag: v10.1.0~148
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=57c6d3b67ad10dcb1ce14c377ca992fe777addbe;p=ceph.git

Merge branch 'debian-stretch-dep-fix' of git://github.com/rldleblanc/ceph

Reviewed-by: Sage Weil <sage@redhat.com>
# Conflicts:
#	debian/control
---

57c6d3b67ad10dcb1ce14c377ca992fe777addbe
diff --cc debian/control
index 899a9356c6f6,9918762b1cf6..bb17fe5e9a04
--- a/debian/control
+++ b/debian/control
@@@ -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