From: Loic Dachary <loic@dachary.org>
Date: Tue, 12 May 2015 14:03:07 +0000 (+0200)
Subject: Merge pull request #4412 from tchaikov/wip-add-man-page
X-Git-Tag: v9.0.2~183
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=44d6429a5d275604b0d9bbb40278ee1aed1e3ce1;p=ceph.git

Merge pull request #4412 from tchaikov/wip-add-man-page

doc: add man page for ceph-create-keys

Reviewed-by: Loic Dachary <ldachary@redhat.com>
---

44d6429a5d275604b0d9bbb40278ee1aed1e3ce1
diff --cc ceph.spec.in
index 717aa011ce6a,638dd2ca4082..575e04f8fcca
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@@ -645,14 -635,9 +645,15 @@@ f
  %endif
  %config %{_sysconfdir}/bash_completion.d/ceph
  %config(noreplace) %{_sysconfdir}/logrotate.d/ceph
 +%if 0%{?suse_version}
 +%config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/ceph-mon
 +%config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/ceph-osd-mds
 +%endif
 +%{python_sitelib}/ceph_detect_init*
  %{_mandir}/man8/ceph-deploy.8*
 +%{_mandir}/man8/ceph-detect-init.8*
  %{_mandir}/man8/ceph-disk.8*
+ %{_mandir}/man8/ceph-create-keys.8*
  %{_mandir}/man8/ceph-mon.8*
  %{_mandir}/man8/ceph-mds.8*
  %{_mandir}/man8/ceph-osd.8*
diff --cc debian/ceph.install
index 73e32ba53307,dca7dab4f53a..6278c437589c
--- a/debian/ceph.install
+++ b/debian/ceph.install
@@@ -25,9 -22,9 +25,10 @@@ usr/libexec/ceph/ceph-osd-prestart.s
  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-create-keys.8
  usr/share/man/man8/ceph-debugpack.8
  usr/share/man/man8/ceph-deploy.8
 +usr/share/man/man8/ceph-detect-init.8
  usr/share/man/man8/ceph-disk.8
  usr/share/man/man8/ceph-mon.8
  usr/share/man/man8/ceph-osd.8