Combine 7.x-2.x-dev and 7.x-2.x #119
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Switch http4 back to http
Also doesn't load on Karaf boot, load after it's up.
Move islandora-components to their own script. Update to ensure we use the correct version of fcrepo and blaze graph Add @ruebot's work from daniel-dgi/islandora#1
Islandora Deux in Karaf
# By Melissa Anez (20) and others # Via Daniel Lamb (5) and others * 7.x-2.x: (62 commits) Incorporating last bit of feedback from @daniel-dgi. IT WORKS. Add try/catch. Remove piping to Karaf, and fix indexing.triplestore.cfg sed. No. Fuseki. NO. Missed a couple more 2.16.0 requirements for camel. Added required title prefix for incoming pull requests that correspond to issues. Fixed some grammar issues. more camel version updating Fix path, and change camel version. Use fcrepo-camel-toolbox in Karaf. Break these out into separate files. Address MkDocs warnings, and clean up formatting. Address #117 Path fixes. Using prerequisite attribute on dependent features. Update 2xfor1x.md Update 2xfor1x.md Update 2xfor1x.md Update 2xfor1x.md Changing image service exports and the watch script. Update 2xfor1x.md ...
|
@Islandora-CLAW/7-x-2-x-committers @nigelgbanks, going to need some sanity builds here, please. |
|
@whikloj sync-gateway doesn't look like it is building according to Travis |
|
@whikloj 👍 All good on my end!!! 🍻 |
|
@Islandora-CLAW/7-x-2-x-committers for sanity, if y'all want, I'm more than happy to spin up a DigitalOcean instance on my account just so y'all can verify. |
|
Just gave it a test spin. Works for me. I'm comfortable merging this. |
daniel-dgi
added a commit
that referenced
this pull request
Nov 27, 2015
Combine 7.x-2.x-dev and 7.x-2.x
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.