Skip to content

Back merge of fixes from 2.7.2-RC#1094

Merged
anthonysena merged 19 commits into
masterfrom
back-merge-2.7.2
May 17, 2019
Merged

Back merge of fixes from 2.7.2-RC#1094
anthonysena merged 19 commits into
masterfrom
back-merge-2.7.2

Conversation

@pavgra

@pavgra pavgra commented May 17, 2019

Copy link
Copy Markdown
Contributor

No description provided.

wivern and others added 19 commits March 29, 2019 13:11
* added permissions to watch IR report

* added migrations to cover newly created sources

* simplify migration queries
* Fixes performance issues with PLE & PLP generations retrieval

* Adds filter to do cache invalidation in case of threads re-usage

* Forgotten change
* Fixed PLE & PLP jobs invalidation

* Fixes transaction
…val on each request (#1024)

* Split EE result files storage into 2 tables and avoid contents retrieval on each request

* Testing and review fixes
* Fixes results persistence for PLE R script

* Apply consistent approach for creating output folder for PLE & PLP
- Install packages into local lib
- Install packages using `R CMD build` to avoid issues on Windows and forced packages `upgrade`
- Do not build vignettes
# Conflicts:
#	pom.xml
#	src/main/java/org/ohdsi/webapi/executionengine/controller/ScriptExecutionCallbackController.java
#	src/main/java/org/ohdsi/webapi/executionengine/service/AnalysisResultFileSensitiveInfoServiceImpl.java
#	src/main/java/org/ohdsi/webapi/executionengine/service/ScriptExecutionServiceImpl.java
#	src/main/java/org/ohdsi/webapi/prediction/PredictionServiceImpl.java
#	src/main/java/org/ohdsi/webapi/shiro/PermissionManager.java
#	src/main/java/org/ohdsi/webapi/shiro/management/AtlasRegularSecurity.java
#	src/main/resources/application.properties
#	src/main/resources/resources/estimation/r/runAnalysis.R
#	src/main/resources/resources/prediction/r/runAnalysis.R
@pavgra pavgra requested a review from anthonysena May 17, 2019 19:55
@anthonysena anthonysena merged commit 772c5ec into master May 17, 2019
@anthonysena anthonysena deleted the back-merge-2.7.2 branch May 17, 2019 22:00
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