]> 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: 255bf71 7aa332c)
Merge branch 'testing' into unstable
authorSage Weil <sage@newdream.net>
Wed, 11 Aug 2010 23:19:56 +0000 (16:19 -0700)
committerSage Weil <sage@newdream.net>
Wed, 11 Aug 2010 23:19:56 +0000 (16:19 -0700)
Conflicts:
configure.ac


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