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

merge() support. Closes #14 #15

Merged
merged 2 commits into from Oct 5, 2015
Merged

merge() support. Closes #14 #15

merged 2 commits into from Oct 5, 2015

Conversation

@hueniverse
Copy link
Member

hueniverse commented Oct 4, 2015

This is blocking hapi 10.4.

@hueniverse hueniverse added the feature label Oct 4, 2015
@devinivy

This comment has been minimized.

Copy link
Member

devinivy commented Oct 5, 2015

Looks good– I wondered if this feature would ever crop up. I'll merge this and update lab for topo v1.1, which will be intended for use with hapi v10.4.

devinivy added a commit that referenced this pull request Oct 5, 2015
merge() support. Closes #14
@devinivy devinivy merged commit c6852a7 into master Oct 5, 2015
2 checks passed
2 checks passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details
@devinivy devinivy deleted the merge branch Oct 5, 2015
@hueniverse hueniverse modified the milestones: 1.1.1, 1.1.0 Oct 5, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.