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

tests: fix merge error in rgw/singleton/all/radosgw-admin.yaml #13952

Merged
merged 1 commit into from Mar 14, 2017

Conversation

smithfarm
Copy link
Contributor

Introduced by 94d5888

Reported-by: Robin H. Johnson robin.johnson@dreamhost.com
Signed-off-by: Nathan Cutler ncutler@suse.com

Introduced by 94d5888

Reported-by: Robin H. Johnson <robin.johnson@dreamhost.com>
Signed-off-by: Nathan Cutler <ncutler@suse.com>
@smithfarm smithfarm added this to the jewel milestone Mar 14, 2017
Copy link
Member

@zmc zmc left a comment

Choose a reason for hiding this comment

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

I... wow, I'm sorry for that. Thanks for catching it!

@zmc zmc merged commit ce2e989 into ceph:jewel Mar 14, 2017
@smithfarm smithfarm deleted the wip-fix-merge-error branch March 14, 2017 15:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants