]> 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: a52c11c 1de46d6)
Merge remote-tracking branch 'origin/next-fix' into next
authorNoah Watkins <noahwatkins@gmail.com>
Wed, 30 Oct 2013 20:30:21 +0000 (13:30 -0700)
committerNoah Watkins <noahwatkins@gmail.com>
Wed, 30 Oct 2013 20:30:21 +0000 (13:30 -0700)
Signed-off-by: Noah Watkins <noahwatkins@gmail.com>

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