Skip to content

Merge branch 'develop' into external-cvoc#56

Merged
PaulBoon merged 365 commits intoDANS-KNAW:external-cvocfrom
PaulBoon:external-cvoc
Mar 16, 2021
Merged

Merge branch 'develop' into external-cvoc#56
PaulBoon merged 365 commits intoDANS-KNAW:external-cvocfrom
PaulBoon:external-cvoc

Conversation

@PaulBoon
Copy link
Copy Markdown

@PaulBoon PaulBoon commented Mar 16, 2021

Merge branch 'develop' into external-cvoc

sekmiller and others added 30 commits January 28, 2021 14:35
and ignore workflow lock if it's yours

Also includes fixes that may be separated for PRs:
Add Finalize lock before invoking FInalize command at end of workflow
module/classpath conflicts showing up in eclipse

ToDo: add flyway script
landreev and others added 25 commits March 5, 2021 11:49
…DANS/7637

Allow publishing conditional on indexing being done, add /timestamps
…n testing guide and fixing an unclosed quote issue in native API guide.
…-readme.md

IQSS#7672: changing outdated reference from readme.txt to readme.md in te…
…est-resources

IQSS#7666: use the production citation.tsv in test, remove the copy store…
6685 truncate methods - dataset pg summary block description
@PaulBoon PaulBoon closed this Mar 16, 2021
@PaulBoon
Copy link
Copy Markdown
Author

Maybe need to have develop updated?

@PaulBoon PaulBoon reopened this Mar 16, 2021
@PaulBoon PaulBoon changed the title External cvoc Merge branch 'develop' into external-cvoc Mar 16, 2021
@PaulBoon PaulBoon merged commit e369ffe into DANS-KNAW:external-cvoc Mar 16, 2021
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.