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

Rel 5 7 mergeback #3401

Merged
merged 25 commits into from
Feb 18, 2022
Merged

Rel 5 7 mergeback #3401

merged 25 commits into from
Feb 18, 2022

Conversation

tadgh
Copy link
Collaborator

@tadgh tadgh commented Feb 17, 2022

Merging back Release 5.7.0 into master.

@tadgh tadgh enabled auto-merge (squash) February 18, 2022 03:57
@codecov
Copy link

codecov bot commented Feb 18, 2022

Codecov Report

Merging #3401 (f600710) into master (6313918) will increase coverage by 0.00%.
The diff coverage is 93.10%.

Impacted file tree graph

@@            Coverage Diff            @@
##             master    #3401   +/-   ##
=========================================
  Coverage     82.96%   82.97%           
  Complexity    20679    20679           
=========================================
  Files          1392     1392           
  Lines         74246    74260   +14     
  Branches      11139    11139           
=========================================
+ Hits          61599    61616   +17     
+ Misses         8362     8360    -2     
+ Partials       4285     4284    -1     
Impacted Files Coverage Δ
...ava/ca/uhn/fhir/jpa/search/builder/QueryStack.java 90.20% <92.72%> (-0.07%) ⬇️
...r/jpa/migrate/tasks/HapiFhirJpaMigrationTasks.java 97.90% <100.00%> (+<0.01%) ⬆️
.../fhir/jpa/search/DatabaseBackedPagingProvider.java 81.81% <100.00%> (+1.81%) ⬆️
...st/server/interceptor/auth/RuleBulkExportImpl.java 78.94% <100.00%> (ø)
...ca/uhn/fhir/jpa/dao/tx/HapiTransactionService.java 73.58% <0.00%> (-5.67%) ⬇️
...e/src/main/java/ca/uhn/fhir/parser/BaseParser.java 84.88% <0.00%> (-0.06%) ⬇️
...e/src/main/java/ca/uhn/fhir/parser/JsonParser.java 84.15% <0.00%> (+0.10%) ⬆️
...se/src/main/java/ca/uhn/fhir/parser/XmlParser.java 86.36% <0.00%> (+0.23%) ⬆️
...or/TransactionConcurrencySemaphoreInterceptor.java 85.29% <0.00%> (+1.47%) ⬆️
... and 2 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 6313918...f600710. Read the comment docs.

@tadgh tadgh merged commit 3561672 into master Feb 18, 2022
@tadgh tadgh deleted the rel_5_7_mergeback branch February 18, 2022 19:22
michaelabuckley added a commit that referenced this pull request Feb 22, 2022
…oken-search-index

* commit 'fcada390442ee3ada2245f49d62c08cde5212cd7':
  add online deferred invalidation keyword for oracle (#3409)
  GraphQL Introspection Support (#3348)
  Fix parameter count limitation on MSSQL/Oracle large transactions (#3075)
  3400 bulk export rules incorrectly applied to group and patient exports (#3403)
  Use integers for date ordinals (#3346)
  Add license files
  Rel 5 7 mergeback (#3401)
  encode narratives of contained resources (#3402)
  remove hapi jpa spring config hierarchy (#3390)

# Conflicts:
#	hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4LuceneDisabledStandardQueries.java
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.

5 participants