Commit Graph

3705 Commits

Author SHA1 Message Date
Wido den Hollander
bcf3a7edcb
mgr: Zabbix monitoring module
This ceph-mgr module will pull various values from the Ceph cluster
and send them to a Zabbix Server using zabbix_sender.

This requires the zabbix_sender executable to be present on the system
running ceph-mgr as it will be invoked to send data to Zabbix.

A Zabbix template can be found in this directory which can be used
to easily get data from your Ceph cluster into Zabbix.

More information is available in the README file found in the module's
directory.

Signed-off-by: Wido den Hollander <wido@42on.com>
2017-07-05 11:06:19 +02:00
John Spray
b363e58530 Merge pull request #15958 from liewegas/wip-mgr-modules
mgr,mon: enable/disable mgr modules via 'ceph mgr module ...' commands

Reviewed-by: John Spray <john.spray@redhat.com>
2017-07-05 00:04:59 +01:00
Nathan Cutler
5ec6c7c2c3 doc: dev: unit tests are not linked against tcmalloc
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2017-07-04 12:25:33 +02:00
Sage Weil
fc76fb7510 os/filestore: require experimental flag for btrfs
This isn't strictly accurate since we're really deprecating, but the
message is appropriately scary and reflects the risk of data loss.

Signed-off-by: Sage Weil <sage@redhat.com>
2017-07-03 12:16:53 -04:00
Patrick Donnelly
6eda735b06
Merge remote-tracking branch 'upstream/pull/16080/head' into HEAD
* upstream/pull/16080/head:
  doc/mon: clean up `mds fail`/`mds deactivate` descriptions

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2017-07-03 09:11:25 -07:00
John Spray
301d53a3c7 doc/mon: clean up mds fail/mds deactivate descriptions
Fixes: http://tracker.ceph.com/issues/20424
Signed-off-by: John Spray <john.spray@redhat.com>
2017-07-03 14:47:29 +01:00
Nathan Cutler
94d6012cb7 doc: dev: change "make check" into an internal Xref
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2017-07-03 15:44:30 +02:00
Nathan Cutler
7f14c6a238 doc: dev: add notes on PR make check test
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2017-07-03 15:44:27 +02:00
Sage Weil
41677d2a07 Merge pull request #16023 from liewegas/wip-19994
systemd/ceph-mgr: remove automagic mgr creation hack

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
Reviewed-by: John Spray <john.spray@redhat.com>
2017-07-01 09:09:52 -05:00
Sage Weil
c9c697225f Merge pull request #16044 from liewegas/wip-i-cant-believe-its-not-btrfs
qa: stop testing btrfs

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2017-06-30 21:17:49 -05:00
Sage Weil
0346998b5a doc: recommend against btrfs
Signed-off-by: Sage Weil <sage@redhat.com>
2017-06-30 13:54:18 -04:00
Sage Weil
58f95820e6 Merge pull request #15963 from Songweibin/wip-release-notes
doc/release-notes: add Images creation timestamp note

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-06-30 09:38:05 -05:00
Sage Weil
289f5ed093 doc: update docs for enabling mgr modules
Signed-off-by: Sage Weil <sage@redhat.com>
2017-06-29 23:10:51 -04:00
Sage Weil
7a3a979f3c systemd/ceph-mgr: remove automagic mgr creation hack
For kraken we auto-created mgr daemons next to mon daemons with some
systemd hackery.  This is awkward (you can't not get a new mgr daemon when
you deploy a mon), systemd-specific (not implemented for upstart on
trusty), and mostly unexpected.  Since ceph-mgr daemons are now first-class
citizens and required for every cluster, make their deployment explicit
and transparent to the administrator.  Major upgrades are a rare
opportunity to have the administrator's full attention so take advantage
of it.

This effectively reverts 61d779345e and
082199f69d (and follow-on fixes).

Fixes/avoids: http://tracker.ceph.com/issues/19994
Signed-off-by: Sage Weil <sage@redhat.com>
2017-06-29 13:39:28 -04:00
Sage Weil
5712698787 Merge pull request #15894 from liewegas/wip-no-default-pool
mon,osd: do not create rbd pool by default
2017-06-29 11:21:42 -05:00
Kefu Chai
42c822dccf doc: update with "mon priority" related changes
* doc/rados/configuration/mon-lookup-dns.rst
  we now partially support RFC2782: only the targets with the lowest
  value are selected
* doc/rados/configuration/network-config-ref.rst
  update with "mon priority" option in "[mon.$id]" section

Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-06-29 13:55:21 +08:00
Sage Weil
e1599901b3 doc/release-notes: fix ceph-deploy command
Signed-off-by: Sage Weil <sage@redhat.com>
2017-06-28 15:02:34 -04:00
Greg Farnum
51838305a2 osdmap: do not automatically create an rbd pool on cluster creation; skip pool 0
We don't use pool ID 0 any more because CephFS can't handle it.
Update the user quick-start to include it, and add some links to support that process.
Fix the tests to handle the new state of life.

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
2017-06-28 10:52:49 -04:00
clove
e7c163bb8f doc/release-notes: add Images creation timestamp note
Signed-off-by: songweibin song.weibin@zte.com.cn
2017-06-28 12:59:06 +08:00
Sage Weil
fe4d15191d Merge pull request #15874 from elliswuuuuuuuu/remove_unuse_config
common/config_opt: remove unused config

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-06-27 10:22:42 -05:00
Wido den Hollander
0f15e4e76b
doc: Mgr Dashboard docs update
More instructions on how to deploy the dashboard using ceph-mgr

Signed-off-by: Wido den Hollander <wido@42on.com>
2017-06-27 15:42:41 +02:00
Abhishek Lekshmanan
8731b277bb doc: Luminous release notes typo fixes
Suggested-by: Roger Brown <rogerbrown@gmail.com>
Signed-off-by: Abhishek Lekshmanan <alekshmanan@suse.com>
2017-06-24 11:29:01 +02:00
John Spray
9e7a12b470 doc: multimds is no longer experimental
Signed-off-by: John Spray <john.spray@redhat.com>
2017-06-23 17:07:34 +01:00
Sage Weil
987fac2e8c doc/release-notes: 'osd crush class rename' is coming
Signed-off-by: Sage Weil <sage@redhat.com>
2017-06-23 10:36:19 -04:00
Sage Weil
7c58966e4e doc/release-notes: ceph tell <foo> help
Signed-off-by: Sage Weil <sage@redhat.com>
2017-06-23 10:36:19 -04:00
Sage Weil
8f44e6f69a doc/start/os-recommendations: update
Signed-off-by: Sage Weil <sage@redhat.com>
2017-06-23 10:36:19 -04:00
Sage Weil
a5436bd234 doc/release-notes: note debian stretch addition
Signed-off-by: Sage Weil <sage@redhat.com>
2017-06-23 10:36:19 -04:00
Sage Weil
12590d9ec1 doc/release-notes: sleep settings
Signed-off-by: Sage Weil <sage@redhat.com>
2017-06-23 10:36:19 -04:00
Sage Weil
0307c1e5c1 doc/release-notes: link to EC docs
Signed-off-by: Sage Weil <sage@redhat.com>
2017-06-23 10:36:19 -04:00
Sage Weil
7cc863b690 doc/release-notes: update RGW metadata
Signed-off-by: Sage Weil <sage@redhat.com>
2017-06-23 10:36:19 -04:00
Sage Weil
2ba6c29d33 dev/release-notes: various updates from other PR
Signed-off-by: Sage Weil <sage@redhat.com>
2017-06-23 10:36:19 -04:00
Sage Weil
43dcb5be61 doc/release-notes: notes on new CLI commands
Signed-off-by: Sage Weil <sage@redhat.com>
2017-06-23 10:36:19 -04:00
Sage Weil
11d9541a6f mon: 'mon feature list' -> 'mon feature ls'
Signed-off-by: Sage Weil <sage@redhat.com>
2017-06-23 10:36:18 -04:00
Sage Weil
829e767d49 doc/release-notes: update luminous notes
Signed-off-by: Sage Weil <sage@redhat.com>
2017-06-23 10:36:18 -04:00
wujian
75e56c4c5d common/config_opt: remove unused config
Signed-off-by: alex.wu <wujian3659@163.com>
2017-06-23 05:41:28 +08:00
Abhishek Lekshmanan
570fa825fd doc: v12.1.0 release notes notable changes addition again
commmits from 9f259cb923e7474229bb2e5e54b59f3b7f068bc5..luminous && sort

Signed-off-by: Abhishek Lekshmanan <alekshmanan@suse.com>
2017-06-22 22:58:37 +02:00
Matt Benjamin
30383502a2 RGW NFS: add nfs.rst to doc/radosgw
This document contains sections by John Wilkins <jowilkin@redhat.com>.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
2017-06-21 08:37:52 -04:00
Sage Weil
6743fb203c Merge pull request #15676 from Linbing/wip-mon-delete-unused-config
mon: delete unused config opts of mon_sync_fs_threshold

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-06-19 22:37:58 -05:00
Sage Weil
368ff5e4aa Merge pull request #15697 from gregsfortytwo/wip-mgr-eaccss-20296
mgr: print a more helpful error message for when users lack mgr ceph caps

Reviewed-by: Alfredo Deza <adeza@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-06-19 22:34:35 -05:00
Abhishek L
1ce55c4649 Merge pull request #15748 from Liuchang0812/wip-fix-release-note
doc/release-note: update release-note

Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
2017-06-18 11:24:10 +02:00
liuchang0812
5e3b7e41c6 doc/release-note: update release-note
Signed-off-by: liuchang0812 <liuchang0812@gmail.com>
2017-06-18 11:56:07 +08:00
Greg Farnum
6846f4830c mgr: print a more helpful error message for when users lack mgr cephx caps
Add some brief documentation on updating their caps and link to it.

Fixes: http://tracker.ceph.com/issues/20296

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
2017-06-16 18:41:10 -07:00
Casey Bodley
3a6471a6e6 doc/rgw: update pool names, document namespaces
Fixes: http://tracker.ceph.com/issues/19504

Signed-off-by: Casey Bodley <cbodley@redhat.com>
2017-06-16 13:32:11 -04:00
Casey Bodley
9cc834e1a0 doc/rgw: remove Upgrade to Older Versions of Jewel page
Signed-off-by: Casey Bodley <cbodley@redhat.com>
2017-06-16 13:32:11 -04:00
Casey Bodley
cf8a3c19de doc/rgw: remove Federated Configuration page
Fixes: http://tracker.ceph.com/issues/18082

Signed-off-by: Casey Bodley <cbodley@redhat.com>
2017-06-16 13:32:10 -04:00
Casey Bodley
10ab5fcff7 doc/rgw: clean up multisite config options
remove region stuff, radosgw-agent stuff, and zone/pool stuff that is
duplicated in the multisite page

moved sync log config options into multisite section, added description
for rgw_run_sync_thread

Signed-off-by: Casey Bodley <cbodley@redhat.com>
2017-06-16 13:32:09 -04:00
Josh Durgin
c15effaccb Merge pull request #15095 from gregsfortytwo/wip-doc-mark-event
doc: describe mark_events logging available via the OSD's OpTracker

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2017-06-15 14:01:09 -04:00
Sage Weil
8c3d7be548 Merge pull request #15707 from tchaikov/wip-20239
doc: document the setup of restful and dashboard plugins
2017-06-15 11:43:19 -05:00
Sage Weil
9943df8711 Merge pull request #15641 from jecluis/wip-mon-deprecate-osd-create
mon: mark `osd create` as deprecated

Reviewed-by: Sage Weil <sage@redhat.com>
2017-06-15 08:58:50 -05:00
Josh Durgin
78d0b278a6 HashIndex: randomize split threshold by a configurable amount
Store a random value up to the filestore_split_rand_factor for each
collection when it is created or apply-layout-settings is run. This
should help distribute the load of splitting directories across a
longer period of time.

Fixes: http://tracker.ceph.com/issues/15835
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
2017-06-15 06:12:19 -07:00
Kefu Chai
774a856ec2 doc: document the setup of restful and dashboard plugins
Fixes: http://tracker.ceph.com/issues/20239
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-06-15 19:13:30 +08:00
Greg Farnum
bc2bfef7fe doc: describe mark_events logging available via the OSD's OpTracker
Signed-off-by: Greg Farnum <gfarnum@redhat.com>
2017-06-14 13:27:24 -07:00
John Spray
1cfeff3661 doc/mgr: update for mgr_beacon_period change
This setting got renamed.

Signed-off-by: John Spray <john.spray@redhat.com>
2017-06-14 10:04:22 -04:00
John Spray
fc990666d5 doc/mgr: flesh out introductory text
Signed-off-by: John Spray <john.spray@redhat.com>
2017-06-14 09:54:27 -04:00
John Spray
b61f0c0b31 doc/mgr: fix auth keys instruction
This was out of date.

Signed-off-by: John Spray <john.spray@redhat.com>
2017-06-14 09:54:26 -04:00
John Spray
fc8b8000b0 doc/install: reference mgr manual setup
Signed-off-by: John Spray <john.spray@redhat.com>
2017-06-14 09:54:26 -04:00
linbing
7fc78257c3 mon: delete unused config opts of mon_sync_fs_threshold and remove it in mon-config-ref
Signed-off-by: linbing <linbing@t2cloud.net>
2017-06-14 13:20:22 +08:00
Leo Zhang
3c1eb63cb9 doc: remove some non-existent and fix the default value according to source code
Signed-off-by: Leo Zhang <nguzcf@gmail.com>
2017-06-13 19:57:07 +08:00
Joao Eduardo Luis
2fd3765440 mon: mark osd create as deprecated
With the introduction of `osd new`, we are now deprecating `osd create`
with the intent of removing it in a future release.

Signed-off-by: Joao Eduardo Luis <joao@suse.de>
2017-06-12 20:59:01 +01:00
Abhishek Lekshmanan
4ad8b90bb8 doc: release notes: notable change for 12.1.0
Adding the changelog from 12.0.3 to 9f259cb923

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
2017-06-12 13:07:11 +02:00
Abhishek Lekshmanan
dd6b45b88f doc: v12.1.0 major changes for release
Adding a section for major changes in 12.1.0 release, sorted by sections
so that we can have a consolidated announce when announcing the release

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
2017-06-12 13:05:39 +02:00
Gregory Farnum
3084fcfda9 Merge pull request #15609 from stiwari/wip-19879
Merge pull request from stiwari/wip-19879
2017-06-09 21:27:19 -07:00
Gregory Farnum
2289e80950 Merge pull request #15606 from stiwari/fix_1
Documentation Fixes for http://tracker.ceph.com/issues/19879

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2017-06-09 14:39:11 -07:00
Josh Durgin
7376e8132f Merge pull request #15550 from jcsp/wip-doc-cephfs-objsize
doc/cephfs: mention RADOS object size limit

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2017-06-09 14:22:56 -07:00
Matt Benjamin
126cd32593 Merge pull request #13395 from dang/wip-quota-cache-doc
Document RGW quota cache options
2017-06-09 13:56:52 -04:00
Sage Weil
b6a5b946f8 Merge pull request #15180 from theanalyst/doc/rgw-dev-s3tests
doc: dev improve the s3tests doc to reflect current scripts
2017-06-09 08:32:10 -05:00
Casey Bodley
babd25fa36 Merge pull request #15301 from shashalu/rgw-ssl
rgw: add "rgw_verify_ssl" config

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2017-06-08 16:01:47 -04:00
Kefu Chai
630010fdba Merge pull request #15566 from baruza/wip-doc-20199
doc: Change the default values of some OSD options

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-06-08 23:10:51 +08:00
Barbora Ančincová
706de54d63 doc: Change the default values of some OSD options
These values were changed to reflect this change a3f9cba

Fixes: http://tracker.ceph.com/issues/20199
Signed-off-by: Bara Ancincova <bara@redhat.com>
2017-06-08 11:49:37 +02:00
Daniel Gryniewicz
4327d1bd2d Document RGW quota cache options
Quota cache options were undocumented.

Fixes: http://tracker.ceph.com/issues/18747
Signed-off-by: Daniel Gryniewicz <dang@redhat.com>
2017-06-07 14:47:04 -04:00
Sameer Tiwari
9e37d893f0 Documentation: Fixed my mistake of describing the journal allowed vs desired.
Update to Bug http://tracker.ceph.com/issues/19879

Signed-off-by: Sameer Tiwari <stiwari@salesforce.com>
2017-06-07 11:53:22 -04:00
John Spray
7b528b1044 doc/cephfs: mention RADOS object size limit
Reflect the recent change in this limit
for 12.x.

Signed-off-by: John Spray <john.spray@redhat.com>
2017-06-07 11:55:57 +01:00
liuchang0812
998ee1d190 doc: kill some broken links
Signed-off-by: liuchang0812 <liuchang0812@gmail.com>
2017-06-07 16:13:45 +08:00
Sameer Tiwari
dcefefb554 Documentation Fixes for http://tracker.ceph.com/issues/19879
and related bug http://tracker.ceph.com/issues/20057

Signed-off-by: Sameer Tiwari <stiwari@salesforce.com>
2017-06-07 03:22:20 -04:00
Kefu Chai
e38ca14914 Merge pull request #15511 from tchaikov/wip-doc-cartesian-product
doc: update sample explaning "%" operator in test suites

Reviewed-by: Nathan Cutler <ncutler@suse.com>
Reviewed-by: Loic Dachary <loic@dachary.org>
2017-06-06 21:57:49 +08:00
Sage Weil
daa5126ed9 Merge pull request #14074 from jecluis/wip-mon-osd-replacement
mon: replace osds with `osd destroy` and `osd new`

Reviewed-by: Sage Weil <sage@redhat.com>
2017-06-06 08:25:15 -05:00
Kefu Chai
b85bf0e61e doc: update sample explaning "%" operator in tes suites
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-06-06 20:49:51 +08:00
John Spray
b1d06a6b54 Merge pull request #15499 from jcsp/wip-doc-whitespace
doc: fix syntax on code snippets in cephfs/multimds

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2017-06-06 12:36:05 +01:00
Sage Weil
3c52569ffb Merge pull request #15429 from jcsp/wip-nuke-rest
pybind/mgr: Delete `rest` module

Reviewed-by: Sage Weil <sage@redhat.com>
2017-06-05 16:36:36 -05:00
John Spray
f76208cbec doc: fix syntax on code snippets in cephfs/multimds
Signed-off-by: John Spray <john.spray@redhat.com>
2017-06-05 20:46:06 +01:00
Joao Eduardo Luis
e80faf198b doc/man: document new mon commands
Includes brief description for `ceph osd new`, `ceph osd destroy` and
`ceph osd purge`.

Signed-off-by: Joao Eduardo Luis <joao@suse.de>
2017-06-05 15:31:41 +01:00
Casey Bodley
bf72bd8dcb Merge pull request #15119 from ceph/wip-rgw-config-docs
doc: mention certain conf vars should be in global

Reviewed-by: Daniel Gryniewicz <dang@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-06-02 14:09:33 -04:00
John Spray
0b24c028a2 doc: remove reference to Calamari API
...to avoid confusion wrt new `restful` module.

Signed-off-by: John Spray <john.spray@redhat.com>
2017-06-02 05:01:23 -04:00
Sage Weil
8bcf3e5781 Merge pull request #15212 from neha-ojha/wip-fix-recovery-sleep-configurable
osd: Implement asynchronous recovery sleep

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2017-06-01 11:54:58 -05:00
Sage Weil
aff9e37e83 Merge pull request #15209 from liewegas/wip-sortbitwise-notes
doc/release-notes: update which jewel version does sortbitwise warning
2017-06-01 11:26:06 -05:00
Andreas Gerstmayr
5ededbef91 doc: add rados xattr commands to manpage
Signed-off-by: Andreas Gerstmayr <andreas.gerstmayr@catalysts.cc>
2017-05-30 16:02:09 +02:00
lu.shasha
8b83b83d1a rgw: add "rgw_verify_ssl" config
http_client whether try to verify ssl when sent https request

Signed-off-by: Shasha Lu <lu.shasha@eisoo.com>
2017-05-27 17:39:32 +08:00
Kefu Chai
af97f164d7 Merge pull request #15111 from Liuchang0812/wip-19885-mgr-help
ceph: introduce "tell x help" subcommand

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-05-27 10:53:22 +08:00
Ken Dreyer
4274c91c28 doc: describe differences with "mds set" vs "fs set"
Thanks to John Spray <jspray@redhat.com> on ceph-users for this
information.

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
2017-05-26 06:38:14 -06:00
Ken Dreyer
02753cdb91 doc: describe CephFS max_file_size
Add a description of max_file_size to the CephFS admin docs.

Thanks to John Spray <jspray@redhat.com> on ceph-users for this
information.

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
2017-05-26 06:38:11 -06:00
liuchang0812
a1cf9ae766 doc/tool: introduce "ceph tell x help" command in man
Signed-off-by: liuchang0812 <liuchang0812@gmail.com>
2017-05-26 10:27:26 +08:00
Nathan Cutler
9e297686f7 Merge pull request #15235 from smithfarm/wip-doc-empowers
doc: fix factual inaccuracy in doc/architecture.rst

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2017-05-25 03:32:30 +02:00
Neha Ojha
a8cad41908 doc: add description about osd_recovery_sleep
Signed-off-by: Neha Ojha <nojha@redhat.com>
2017-05-24 17:02:53 -07:00
Ken Dreyer
87d47b0dfa docs: document "osd recovery max single start" setting
Fixes: http://tracker.ceph.com/issues/17396
Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
2017-05-24 14:41:17 -06:00
Sage Weil
773a3f3db2 Merge pull request #15175 from cloudbau/update-rgw-docs
doc: Update some RGW documentation

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2017-05-24 11:38:34 -05:00
Nathan Cutler
9a10c5c7c6 doc: doc/architecture.rst: unify initial caps in term Ceph Monitor
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2017-05-23 16:56:53 +02:00
Nathan Cutler
d54d80958b doc: fix factual inaccuracy in doc/architecture.rst
Signed-off-by: Sage Weil <sage@redhat.com>
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2017-05-23 16:56:48 +02:00
John Spray
45caf26140 mds: improve eviction usability and update docs
The "session ls" and "session evict" are now
"client ls" and "client evict" (the old ones
are still there for backwards compatibility).

The automatic client eviction now emits
cluster logs that call the client by its
friendly name (usually the hostname).

Signed-off-by: John Spray <john.spray@redhat.com>
2017-05-23 05:22:17 -04:00
John Spray
048e825484 mds: make blacklisting configurable in kill_session
This makes the code a bit awkward because we now have
4x paths through this function (blocking, noblocking, blacklisting,
nonblacklisting).

Signed-off-by: John Spray <john.spray@redhat.com>
2017-05-23 05:22:16 -04:00
Sage Weil
7ebe7c1cfb Merge pull request #15195 from theanalyst/doc/12.0.3-typo-fix
doc: fixing an error in 12.0.3 release notes

Reviewed-by: Nathan Cutler <ncutler@suse.com>
Reviewed-by: Loic Dachary <loic@dachary.org>
2017-05-22 12:46:43 -05:00