]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge remote-tracking branch 'origin/wip-doc-radosgw-80'
authorJosh Durgin <josh.durgin@inktank.com>
Mon, 5 May 2014 22:12:29 +0000 (15:12 -0700)
committerJosh Durgin <josh.durgin@inktank.com>
Mon, 5 May 2014 22:14:22 +0000 (15:14 -0700)
commitea34f48cd9ad7fa71f43d5570a4ea299a4a7c7e9
tree8a4b7af07c7e80d5632d55e78315eed6a7236b0b
parent3c9529ad3a98908c2bdf242afc02e1d2df30d5f1
parentfc3318edb7331505b509a610947d1bf970234b67
Merge remote-tracking branch 'origin/wip-doc-radosgw-80'

Conflicts:
doc/radosgw/config.rst
doc/radosgw/config.rst