Skip to content

Changes

Summary

  1. Bump submodules (details)
  2. merge master -Dorg -Ssuccess-only (details)
  3. Update component versions (details)
The file was modified omero-renderer (diff)
The file was modified omero-common (diff)
The file was modified omero-gateway-java (diff)
The file was modified omero-server (diff)
The file was modified omero-romio (diff)
The file was modified omero-model (diff)
The file was modified omero-blitz (diff)
Commit 14fd8c4ea95ea3f0913695cffda070e4f69d74a5 by snoopycrimecop
merge master -Dorg -Ssuccess-only

Repository: ome/omero-build
Already up to date.

Repository: ome/omero-blitz
Already up to date.

Merged PRs:
  - PR 119 dominikl 'Take Ice and omero sysenv variables into account'
  - PR 132 jburel 'Fix javadoc warning'

Repository: ome/omero-common
Excluded PRs:
  - PR 45 ehrenfeu 'Do not hide "Make Movie" from script menu' (user: ehrenfeu)
  - PR 40 jburel 'set classifier' (exclude comment)
  - PR 29 dominikl 'Add method to get pixel min max' (exclude comment)
Already up to date.

Merged PRs:
  - PR 42 jburel 'include all'

Repository: ome/omero-gateway-java
Excluded PRs:
  - PR 30 jburel 'Import image' (exclude comment)
Already up to date.

Merged PRs:
  - PR 93 dominikl 'Renderfacility'

Repository: ome/omero-model
Already up to date.

Repository: ome/omero-renderer
Excluded PRs:
  - PR 10 joshmoore 'Allow passing ExecutorService to region task' (label: exclude)
Already up to date.

Repository: ome/omero-romio
Excluded PRs:
  - PR 14 chris-allan 'Bye bye commons-io' (exclude comment)
Already up to date.

Repository: ome/omero-server
Excluded PRs:
  - PR 166 kkoz 'Experimenter group cache' (stage: draft)
  - PR 116 dominikl 'Add method to get pixel min max' (exclude comment)
Already up to date.

Merged PRs:
  - PR 152 jburel 'Set class in doc'

Conflicting PRs (not included):
  - PR 61 joshmoore 'Pass user executor to rendering tasks'

Generated by OMERO-build-push#356 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/356/)
The file was modified omero-blitz (diff)
The file was modified omero-model (diff)
The file was modified omero-renderer (diff)
The file was modified omero-server (diff)
The file was modified omero-common (diff)
The file was modified .gitmodules (diff)
The file was modified omero-gateway-java (diff)
The file was modified omero-romio (diff)
Commit f11b2386a7c0d794ac0ed8edf3c2be3c48208d13 by snoopycrimecop
Update component versions
The file was modified omero-model (diff)
The file was modified omero-gateway-java (diff)
The file was modified omero-server (diff)
The file was modified omero-blitz (diff)
The file was modified omero-romio (diff)
The file was modified omero-renderer (diff)
The file was modified omero-common (diff)