]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c4e888f d82c497)
Merge remote-tracking branch 'github/wip-fs-lockouts' into greg-fs-testing
authorGreg Farnum <gfarnum@redhat.com>
Fri, 8 Apr 2016 00:07:16 +0000 (17:07 -0700)
committerGreg Farnum <gfarnum@redhat.com>
Fri, 8 Apr 2016 00:07:16 +0000 (17:07 -0700)
Protect a number of unstable/experimental features behind durable flags

https://github.com/ceph/ceph/pull/8383

Reviewed-by: John Spray <john.spray@redhat.com>
1  2 
qa/workunits/cephtool/test.sh patch | diff1 | diff2 | blob | history
qa/workunits/rest/test.py patch | diff1 | diff2 | blob | history

diff --cc qa/workunits/cephtool/test.sh
Simple merge
diff --cc qa/workunits/rest/test.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.