]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'gh/wip-swift' into next
authorSage Weil <sage@inktank.com>
Sat, 20 Jul 2013 04:08:18 +0000 (21:08 -0700)
committerSage Weil <sage@inktank.com>
Sat, 20 Jul 2013 04:08:18 +0000 (21:08 -0700)
Reviewed-by: Greg Farnum <greg@inktank.com>

Trivial merge