]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 21cefaf 00a8393)
Merge remote-tracking branch 'gh/infernalis'
authorSage Weil <sage@redhat.com>
Tue, 6 Oct 2015 20:49:46 +0000 (16:49 -0400)
committerSage Weil <sage@redhat.com>
Tue, 6 Oct 2015 20:49:46 +0000 (16:49 -0400)
Conflicts:
suites/upgrade/hammer-x/point-to-point-x/point-to-point.yaml


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