Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

jewel: rgw: add radosgw-admin sync error trim to trim sync error log #21210

Merged
merged 1 commit into from
May 18, 2018

Conversation

pdvian
Copy link

@pdvian pdvian commented Apr 3, 2018

Signed-off-by: fang yuxiang fang.yuxiang@eisoo.com
(cherry picked from commit 233a4d2)

Conflicts:
	doc/man/8/radosgw-admin.rst
	src/rgw/rgw_admin.cc
	src/test/cli/radosgw-admin/help.t: Resolved for sync error list and trim
@smithfarm
Copy link
Contributor

jenkins test docs

@smithfarm smithfarm added the rgw label Apr 3, 2018
@smithfarm smithfarm added this to the jewel milestone Apr 3, 2018
@smithfarm smithfarm requested a review from cbodley May 17, 2018 09:13
@smithfarm
Copy link
Contributor

@cbodley This passed an rgw suite at http://tracker.ceph.com/issues/21742#note-30

The cherry-pick did not apply cleanly - the commit message includes a conflicts section.

OK to merge?

Copy link
Contributor

@cbodley cbodley left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks!

@smithfarm smithfarm merged commit 8b98524 into ceph:jewel May 18, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants