From: Nilamdyuti Goswami <ngoswami@redhat.com>
Date: Thu, 18 Dec 2014 09:02:05 +0000 (+0530)
Subject: packaging: package ceph-deploy(8)
X-Git-Tag: v0.91~33^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2b577cef006f15e8ba6fd68beab1494a5a38e477;p=ceph.git

packaging: package ceph-deploy(8)

Fixes merge conflict.

Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
---

diff --git a/ceph.spec.in b/ceph.spec.in
index d36652764c0d..249e7d9edca6 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -499,6 +499,7 @@ fi
 %config %{_sysconfdir}/bash_completion.d/ceph
 %config(noreplace) %{_sysconfdir}/logrotate.d/ceph
 %config(noreplace) %{_sysconfdir}/logrotate.d/radosgw
+%{_mandir}/man8/ceph-deploy.8*
 %{_mandir}/man8/ceph-disk.8*
 %{_mandir}/man8/ceph-mon.8*
 %{_mandir}/man8/ceph-mds.8*
diff --git a/debian/ceph.install b/debian/ceph.install
index 1055993d807e..2205e5e20b21 100644
--- a/debian/ceph.install
+++ b/debian/ceph.install
@@ -24,6 +24,7 @@ usr/share/doc/ceph/sample.ceph.conf
 usr/share/doc/ceph/sample.fetch_config
 usr/share/man/man8/ceph-clsinfo.8
 usr/share/man/man8/ceph-debugpack.8
+usr/share/man/man8/ceph-deploy.8
 usr/share/man/man8/ceph-disk.8
 usr/share/man/man8/ceph-mon.8
 usr/share/man/man8/ceph-osd.8