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

cleanup of inline rdocs in dns::server::options class #73

Merged
merged 3 commits into from
Jan 31, 2015
Merged

cleanup of inline rdocs in dns::server::options class #73

merged 3 commits into from
Jan 31, 2015

Conversation

talisto
Copy link
Contributor

@talisto talisto commented Jan 26, 2015

@solarkennedy
Copy link
Collaborator

Perfect. We should have been insisting on this from the beginning.
I guess I could have merged this first, then you probably wouldn't have to rebase, but can you fix the new conflict?

Conflicts:
	manifests/server/options.pp
solarkennedy added a commit that referenced this pull request Jan 31, 2015
cleanup of inline rdocs in `dns::server::options` class
@solarkennedy solarkennedy merged commit def0161 into ajjahn:master Jan 31, 2015
@solarkennedy
Copy link
Collaborator

Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants