]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
projects / ceph.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: fa2a861 51722de)
Merge remote-tracking branch 'origin/wip-10390' into greg-testing-quotas
authorGreg Farnum <gfarnum@redhat.com>
Mon, 20 Apr 2015 01:18:35 +0000 (18:18 -0700)
committerGreg Farnum <gfarnum@redhat.com>
Mon, 20 Apr 2015 01:18:35 +0000 (18:18 -0700)
commitf83976c2588aafc3992155b1405f6da0476054c7
treedb33c8e0596c2ca0bdef3372bf01379714c3ee3etree | snapshot
parentfa2a86196c3ed39c1726be689e42ed5d4aae197acommit | diff
parent51722def9fed2c8e84bf20366bf8208383802660commit | diff
Merge remote-tracking branch 'origin/wip-10390' into greg-testing-quotas

Conflicts:
suites/fs/recovery/tasks/mds-full.yaml
suites/fs/recovery/tasks/client-limits.yaml diff1 | diff2 | blob | history
suites/fs/recovery/tasks/mds-full.yaml diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.