]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #6059 from dwj192/dwj-master-tip
authorYehuda Sadeh <yehuda@redhat.com>
Fri, 6 Nov 2015 19:33:40 +0000 (11:33 -0800)
committerYehuda Sadeh <yehuda@redhat.com>
Fri, 6 Nov 2015 19:33:40 +0000 (11:33 -0800)
rgw:mdlog trim add usage prompt

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
1  2 
src/rgw/rgw_admin.cc
src/test/cli/radosgw-admin/help.t

Simple merge
Simple merge