]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 780c299 73c2cee)
Merge branch 'kraken' into wip-oi-mismatch 12803/head
authorJosh Durgin <jdurgin@redhat.com>
Thu, 5 Jan 2017 20:59:14 +0000 (12:59 -0800)
committerGitHub <noreply@github.com>
Thu, 5 Jan 2017 20:59:14 +0000 (12:59 -0800)

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