]> 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: 3e42191 0b964c3)
Merge branch 'locks' into unstable
authorGreg Farnum <gregf@hq.newdream.net>
Mon, 2 Aug 2010 22:36:26 +0000 (15:36 -0700)
committerGreg Farnum <gregf@hq.newdream.net>
Mon, 2 Aug 2010 22:36:26 +0000 (15:36 -0700)

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