]> 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: e4a7106 7bfe0c3)
Merge remote-tracking branch 'gh/next'
authorSage Weil <sage@redhat.com>
Tue, 5 May 2015 23:32:35 +0000 (16:32 -0700)
committerSage Weil <sage@redhat.com>
Tue, 5 May 2015 23:32:35 +0000 (16:32 -0700)
Conflicts:
suites/fs/recovery/tasks/client-limits.yaml
suites/fs/recovery/tasks/mds-full.yaml
tasks/ceph_deploy.py


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.