]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 02ce734 7b43f6b)
Merge branch 'wannoying'
authorColin Patrick McCabe <cmccabe@alumni.cmu.edu>
Thu, 3 Feb 2011 12:36:56 +0000 (04:36 -0800)
committerColin Patrick McCabe <cmccabe@alumni.cmu.edu>
Thu, 3 Feb 2011 12:36:56 +0000 (04:36 -0800)

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