]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge PR #16378 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Tue, 8 Aug 2017 16:33:52 +0000 (09:33 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Tue, 8 Aug 2017 16:33:52 +0000 (09:33 -0700)
commiteabe6626141df3f1b253c880aa6cb852c8b7ac1d
tree936f0c7fb9c8167633a890d912383038023e3d92
parent43d8e23971725c61ddf2f200d56fb996d399c9d5
parent41849fdcd1b0ddb36fbf8bcec97539ddf2999f25
Merge PR #16378 into master

* refs/remotes/upstream/pull/16378/head:
doc: remove accidental additions to release notes
qa/cephfs: Fix race in test_volume_client
qa/cephfs: Test filtered df
PendingReleaseNotes: add note about df filtering
client: Support new, filtered MStatfs
objecter: Support new, filtered MStatfs
mon/PGMap stats: Support new, filtered MStatfs
messages: Add optional data pool to MStatfs

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
src/client/Client.cc
src/mon/PGMap.cc
src/osdc/Objecter.cc