Merge remote-tracking branch 'origin/OpenOLAT_14.2' into OpenOLAT_15.1 (a1c799e0) · Commits · Lars Oliver Dam / OLAT CI-CD Testing Project · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

OLAT CI-CD Testing Project
- Activity
- Members
- Labels
- Terraform modules
- Service Desk
- Contributor analytics
- Model experiments

Snippets Groups Projects

a1c799e0

Commit a1c799e0 authored 4 years ago by srosse

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/OpenOLAT_14.2' into OpenOLAT_15.1

parents 63f24afb b42e2e12

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

pom.xml 4 additions, 6 deletions

pom.xml
src/main/java/org/olat/core/commons/services/jmx/_spring/jmxContext.xml 0 additions, 4 deletions

...org/olat/core/commons/services/jmx/_spring/jmxContext.xml
src/main/resources/serviceconfig/olat.properties 4 additions, 6 deletions

src/main/resources/serviceconfig/olat.properties
src/test/profile/mysql/olat.local.properties 0 additions, 1 deletion

src/test/profile/mysql/olat.local.properties
src/test/profile/oracle/olat.local.properties 0 additions, 1 deletion

src/test/profile/oracle/olat.local.properties
src/test/profile/postgresql/olat.local.properties 0 additions, 1 deletion

src/test/profile/postgresql/olat.local.properties

with 8 additions and 19 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment