]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #16378 into HEAD
authorPatrick Donnelly <pdonnell@redhat.com>
Tue, 8 Aug 2017 16:40:27 +0000 (09:40 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Tue, 8 Aug 2017 16:40:27 +0000 (09:40 -0700)
* 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>
1  2 
src/client/Client.cc
src/mon/PGMap.cc
src/osdc/Objecter.cc

Simple merge
Simple merge
Simple merge