]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'wip_snap_trimmer'
authorSamuel Just <samuel.just@dreamhost.com>
Wed, 22 Jun 2011 18:42:14 +0000 (11:42 -0700)
committerSamuel Just <samuel.just@dreamhost.com>
Wed, 22 Jun 2011 18:42:14 +0000 (11:42 -0700)

Trivial merge