]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
projects / ceph.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 796331d 2da9449)
Merge branch 'wip-scrub-repair' of git://github.com/ukernel/ceph into greg-fs-testing
authorGreg Farnum <gfarnum@redhat.com>
Tue, 8 Mar 2016 00:19:39 +0000 (16:19 -0800)
committerGreg Farnum <gfarnum@redhat.com>
Tue, 8 Mar 2016 00:19:39 +0000 (16:19 -0800)
commit976358111d6d072ceacc43bada465d07fc887fe2
treeee7b9c47b9fc79ddd552b3d136504d1f0f6e8a34tree | snapshot
parent796331d6a17b4f5ea6f133ed2b56d5780cbcf6f1commit | diff
parent2da944961374be1a6fe624ba844c8cbce0d35522commit | diff
Merge branch 'wip-scrub-repair' of git://github.com/ukernel/ceph into greg-fs-testing

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

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Unnamed repository; edit this file 'description' to name the repository.