Closed patdunlavey closed 5 years ago
@br2490 All the conflicts were due to Drupal core version having been "updated" to 7.60 on the Islandora7.x-1.12 branch, whereas it has been updated to 7.63 on the master branch.I resolved all conflicts in favor of the master branch.
I did some testing locally, and found a couple issues. I'm confident that neither are related to any of this code, however. (They were: a couple missing module complaints; and the mods_originInfo_dateCreated_sort field is multi-valued in my setup which breaks solr sort.) I think these can be ignored, at least in the context of this PR.
This PR is now able to be merged, and I'll turn it over to you to review and get back to me if there are any questions or issues.
Pat
Thank you, Pat! I should have time soon to review and pull. :) TY for working this out.
Instructional Application Developer Instructional Media and Technology, Barnard Library and Academic Information Services p: 212-854-9005
On Thu, Jul 25, 2019 at 3:55 PM Pat Dunlavey notifications@github.com wrote:
@br2490 https://github.com/br2490 All the conflicts were due to Drupal core version having been "updated" to 7.60 on the Islandora7.x-1.12 branch, whereas it has been updated to 7.63 on the master branch.I resolved all conflicts in favor of the master branch.
I did some testing locally, and found a couple issues. I'm confident that neither are related to any of this code, however. (They were: a couple missing module complaints; and the mods_originInfo_dateCreated_sort field is multi-valued in my setup which breaks solr sort.) I think these can be ignored, at least in the context of this PR.
This PR is now able to be merged, and I'll turn it over to you to review and get back to me if there are any questions or issues.
Pat
— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub https://github.com/BarnardArchives/digitalcollections.barnard.edu/pull/71?email_source=notifications&email_token=ADMGK3GLODKRYVDRGC2NN6LQBIAMNA5CNFSM4GLDBEF2YY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOD22TC6Y#issuecomment-515191163, or mute the thread https://github.com/notifications/unsubscribe-auth/ADMGK3CIUMX3EE7Q7W6XJFTQBIAMNANCNFSM4GLDBEFQ .
… barnard.drush.make. This brings all islandora modules to their currently recommended release.
The
Islandora7.x-1.12
branch should be checked out and tested on the dev server. If good, then we should be able to accept this PR to master and deploy on production.