Skip to content

Commit

Permalink
merge master -Dorg -Ssuccess-only
Browse files Browse the repository at this point in the history
Repository: ome/bio-formats-build
Excluded PRs:
  - PR 632 dependabot[bot] 'Bump ZarrReader from `9a9e662` to `b17c3ab`' (status: failure)
Already up to date.

Repository: ome/ZarrReader
Excluded PRs:
  - PR 95 dgault 'Class cast exception when parsing metadata' (status: failure)
  - PR 20 dgault 'ZarrReader: Use chunk API' (exclude comment)
Updating 9a9e662..b17c3ab
Previously merged:
  - PR 93 dgault 'Bump version to 0.5.3-SNAPSHOT'
  - PR 92 dgault 'Bump version to 0.5.2'
  - PR 91 dgault 'Bump Bio-Formats version to 7.3.1'

Merged PRs:
  - PR 97 melissalinkert 'Bump Bio-Formats version to 8.0.0'
  - PR 98 dominikl 'Channel coeff can be Integer or Double'

Repository: ome/bio-formats-documentation
Already up to date.

Merged PRs:
  - PR 394 pwalczysko 'Add sas.upenn.edu to ignore list linkchecker'

Repository: ome/bio-formats-examples
Already up to date.

Merged PRs:
  - PR 69 dgault 'Add macro examples from OME 2020 NGFF workshop'

Repository: openmicroscopy/bioformats
Excluded PRs:
  - PR 4249 marcobitplane 'Imaris Reader: support for LZ4 compression and performance improvements' (user: marcobitplane)
  - PR 4196 melissalinkert 'DICOM: use FrameTimePointer to detect timelapse data' (label: exclude)
  - PR 4172 sbesson 'testSaneUsedFiles: check getCurrentFile is the first file in the getUsedFiles list' (stage: draft)
  - PR 4131 dgault 'VirtualImagePlus: Retain B&C settings for each slice' (status: failure)
  - PR 4092 NicoKiaru 'Commits an alternative Zeiss CZI Reader' (user: NicoKiaru)
  - PR 4000 XLEFReaderForBioformats 'Reworking LMSMetadata package and adding a new lif reader' (user: XLEFReaderForBioformats)
  - PR 3794 dgault 'Chunk API: Add new API and functionality for reading and writing chunks' (label: exclude)
  - PR 3618 dgault 'Memoizer: Persist caching to sub readers' (label: breaking)
Already up to date.

Merged PRs:
  - PR 4130 carandraug 'matlab/bfGetPlane.m: avoid use of makeDataArray2D when Octave (ome/bio-formats-octave-docker#29)'
  - PR 4195 WalkerKnapp 'Andor SIF: Support files larger than 4 GB and with non-fixed-size footers'
  - PR 4219 melissalinkert 'ImageJ exporter: save original metadata'
  - PR 4243 melissalinkert 'Update IExtraMetadataWriter.setExtraMetadata(...) to accept an Object'
  - PR 4248 melissalinkert 'Operetta reader: don't add directories to the used files list'

Repository: ome/ome-codecs
Already up to date.

Merged PRs:
  - PR 41 rharkes 'Add LZ4 compression/decompression'

Repository: ome/ome-common-java
Already up to date.

Repository: ome/ome-jai
Already up to date.

Repository: ome/ome-mdbtools
Already up to date.

Repository: ome/ome-metakit
Already up to date.

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

Conflicting PRs (not included):
  - PR 174 jburel 'Remove docs'

Repository: ome/ome-poi
Already up to date.

Repository: ome/ome-stubs
Already up to date.

Generated by BIOFORMATS-push#247 (https://merge-ci.openmicroscopy.org/jenkins/job/BIOFORMATS-push/247/)
  • Loading branch information
snoopycrimecop committed Oct 31, 2024
1 parent 601c856 commit 8b307c7
Show file tree
Hide file tree
Showing 13 changed files with 36 additions and 36 deletions.
48 changes: 24 additions & 24 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,48 +1,48 @@
[submodule "ome-common-java"]
path = ome-common-java
url = https://github.com/ome/ome-common-java.git
branch = master
url = https://github.com/snoopycrimecop/ome-common-java.git
branch = merge_ci
[submodule "ome-model"]
path = ome-model
url = https://github.com/ome/ome-model.git
branch = master
url = https://github.com/snoopycrimecop/ome-model.git
branch = merge_ci
[submodule "ome-poi"]
path = ome-poi
url = https://github.com/ome/ome-poi.git
branch = master
url = https://github.com/snoopycrimecop/ome-poi.git
branch = merge_ci
[submodule "ome-mdbtools"]
path = ome-mdbtools
url = https://github.com/ome/ome-mdbtools.git
branch = master
url = https://github.com/snoopycrimecop/ome-mdbtools.git
branch = merge_ci
[submodule "ome-jai"]
path = ome-jai
url = https://github.com/ome/ome-jai.git
branch = master
url = https://github.com/snoopycrimecop/ome-jai.git
branch = merge_ci
[submodule "ome-codecs"]
path = ome-codecs
url = https://github.com/ome/ome-codecs.git
branch = master
url = https://github.com/snoopycrimecop/ome-codecs.git
branch = merge_ci
[submodule "ome-metakit"]
path = ome-metakit
url = https://github.com/ome/ome-metakit.git
branch = master
url = https://github.com/snoopycrimecop/ome-metakit.git
branch = merge_ci
[submodule "ome-stubs"]
path = ome-stubs
url = https://github.com/ome/ome-stubs.git
branch = master
url = https://github.com/snoopycrimecop/ome-stubs.git
branch = merge_ci
[submodule "bioformats"]
path = bioformats
url = https://github.com/openmicroscopy/bioformats.git
branch = develop
url = https://github.com/snoopycrimecop/bioformats.git
branch = merge_ci
[submodule "bio-formats-documentation"]
path = bio-formats-documentation
url = https://github.com/ome/bio-formats-documentation.git
branch = master
url = https://github.com/snoopycrimecop/bio-formats-documentation.git
branch = merge_ci
[submodule "bio-formats-examples"]
path = bio-formats-examples
url = https://github.com/ome/bio-formats-examples.git
branch = master
url = https://github.com/snoopycrimecop/bio-formats-examples.git
branch = merge_ci
[submodule "ZarrReader"]
path = ZarrReader
url = https://github.com/ome/ZarrReader.git
branch = main
url = https://github.com/snoopycrimecop/ZarrReader.git
branch = merge_ci
2 changes: 1 addition & 1 deletion ZarrReader
2 changes: 1 addition & 1 deletion ome-codecs
2 changes: 1 addition & 1 deletion ome-common-java
Submodule ome-common-java updated 0 files
2 changes: 1 addition & 1 deletion ome-jai
Submodule ome-jai updated 0 files
2 changes: 1 addition & 1 deletion ome-mdbtools
Submodule ome-mdbtools updated 0 files
2 changes: 1 addition & 1 deletion ome-metakit
Submodule ome-metakit updated 0 files
2 changes: 1 addition & 1 deletion ome-model
Submodule ome-model updated 0 files
2 changes: 1 addition & 1 deletion ome-poi
Submodule ome-poi updated 0 files
2 changes: 1 addition & 1 deletion ome-stubs
Submodule ome-stubs updated 0 files

0 comments on commit 8b307c7

Please sign in to comment.