diff options
author | Sage Weil <sage@inktank.com> | 2013-03-14 21:11:35 -0700 |
---|---|---|
committer | Sage Weil <sage@inktank.com> | 2013-03-14 21:11:35 -0700 |
commit | 632f7200bb15585ad71ac0d49d31b65510231494 (patch) | |
tree | 95e5dfbdd6e1b59d48f70349f556f95e764a7311 /debian | |
parent | 80af5fb887f30792c342ac16da9ed95d7e89e491 (diff) | |
parent | 11650c5a8cd851a64280efbb89826668ef029f10 (diff) | |
download | ceph-632f7200bb15585ad71ac0d49d31b65510231494.tar.gz |
Merge branch 'next'
Conflicts:
src/mon/AuthMonitor.cc
Diffstat (limited to 'debian')
-rw-r--r-- | debian/control | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/debian/control b/debian/control index 1a8753f39ed..340e6dfda86 100644 --- a/debian/control +++ b/debian/control @@ -38,6 +38,8 @@ Package: ceph-mds Architecture: linux-any Depends: ${shlibs:Depends}, ${misc:Depends}, ceph Recommends: ceph-fuse, libcephfs1, ceph-fs-common +Replaces: ceph (<< 0.58-1) +Breaks: ceph (<< 0.58-1) Description: metadata server for the ceph distributed file system Ceph is a distributed storage and network file system designed to provide excellent performance, reliability, and scalability. |