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

Resync upstream #94

Merged
merged 18 commits into from Mar 18, 2019

Conversation

Projects
None yet
1 participant
@ndw
Copy link
Member

ndw commented Mar 18, 2019

I've carelessly allowed a fair bit of divergence between my fork and the "real" repo. This big patch attempts to get them back in sync.

ndw added some commits Mar 18, 2019

@ndw

This comment has been minimized.

Copy link
Member Author

ndw commented Mar 18, 2019

Tests on PRs always fail because they can't spin up MarkLogic server. I believe this works.

@ndw ndw merged commit 30d8280 into marklogic:master Mar 18, 2019

1 check failed

continuous-integration/travis-ci/pr The Travis CI build failed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.