]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 235f4ca 4f7e26f)
Merge remote-tracking branch 'origin/next'
authorJohn Spray <john.spray@redhat.com>
Tue, 24 Jun 2014 23:00:28 +0000 (16:00 -0700)
committerJohn Spray <john.spray@redhat.com>
Tue, 24 Jun 2014 23:00:28 +0000 (16:00 -0700)

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