Merge pull request #3303 from jburel/importer-fix

remaining editor
Update develop submodules

Repository: openmicroscopy/openmicroscopy
Already up-to-date.

Repository: openmicroscopy/bioformats
Updating b97e94a..2662590
Previously merged:
  # PR 1504 sbesson 'Allow to run tests in non-default locale'
  # PR 1498 sbesson 'Ant target reviews'
  # PR 1493 melissalinkert 'Add a page that gives an overview of each repository component'
  # PR 1480 melissalinkert 'Imspector OBF: support version 5 stacks'
  # PR 1495 melissalinkert 'ImageJ: enable min/max calculation if any series contains float data'
  # PR 1489 sbesson 'Use Javadocs rather than source code links when possible'
  # PR 1442 bramalingam 'Update roi handler'

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

Repository: openmicroscopy/ome-documentation
Updating a80a912..f51326d
Previously merged:
  # PR 1057 snoopycrimecop 'Update auto-generated properties'

Generated by OMERO-5.1-latest-submods#274 (http://ci.openmicroscopy.org/job/OMERO-5.1-latest-submods/274/)
merge develop -Dorg -Ssuccess-only: PR 3208 (Update the OMERO install script to test Web login with CSRF (rebased onto develop))
merge develop -Dorg -Ssuccess-only: PR 3237 (Fix web attachment error msg develop)
merge develop -Dorg -Ssuccess-only: PR 3249 (Tables set all metadata 12606)
merge develop -Dorg -Ssuccess-only: PR 3264 (Support for collapsing unique light paths (rebased onto develop))
merge develop -Dorg -Ssuccess-only: PR 3282 (Make movie web)
merge develop -Dorg -Ssuccess-only: PR 3285 (Thumbnail by section)
merge develop -Dorg -Ssuccess-only: PR 3289 (CLI error report)
merge develop -Dorg -Ssuccess-only: PR 3290 (Units/Windows kludge: camelcase Pascal)
merge develop -Dorg -Ssuccess-only: PR 3292 (keep our annotations on others' data)
merge develop -Dorg -Ssuccess-only: PR 3302 (Update develop submodules)
merge develop -Dorg -Ssuccess-only

Repository: openmicroscopy/openmicroscopy
Excluded PRs:
  # PR 3286 mtbc 'fix #11182: avoid Cartesian product of REINDEX eventlog entries' (label: breaking)
  # PR 3295 dominikl 'MapAnnotation tests ' (label: exclude)
  # PR 3141 dpwrussell 'jstree upgrade (Functionality Review Only)' (exclude comment)
  # PR 2182 joshmoore 'Read only flag' (label: exclude)
  # PR 2585 aleksandra-tarkowska 'making time_zone and first_day_of_week configurable' (exclude comment)
  # PR 2363 dominikl 'Java Gateway API' (label: exclude breaking)
  # PR 3181 joshmoore 'Update to Hibernate 3.6 (See trac2570)' (label: exclude breaking)
  # PR 3296 sbesson 'Integration library' (label: exclude)
  # PR 3086 will-moore 'Create image by tiling 12459' (label: exclude)
  # PR 3042 will-moore 'Download dataset project' (label: exclude)
  # PR 3000 jballanc 'Update artifacts for Lucene, Hibernate, and Spring' (user: jballanc)
  # PR 3098 aleksandra-tarkowska 'Metadata reimport' (label: exclude)
Already up-to-date.

Merged PRs:
  # PR 3208 sbesson 'Update the OMERO install script to test Web login with CSRF (rebased onto develop)'
  # PR 3237 zeb 'Fix web attachment error msg develop'
  # PR 3249 manics 'Tables set all metadata 12606'
  # PR 3264 jburel 'Support for collapsing unique light paths (rebased onto develop)'
  # PR 3282 will-moore 'Make movie web'
  # PR 3285 will-moore 'Thumbnail by section'
  # PR 3289 jburel 'CLI error report'
  # PR 3290 joshmoore 'Units/Windows kludge: camelcase Pascal'
  # PR 3292 mtbc 'keep our annotations on others' data'
  # PR 3302 snoopycrimecop 'Update develop submodules'

Repository: openmicroscopy/bioformats
Excluded PRs:
  # PR 1309 melissalinkert 'Allow tile-based access of large JPEG-2000 images' (exclude comment)
  # PR 1479 qidane 'Updated XSLT for units conversion' (exclude comment)
  # PR 1426 qidane 'Initial Rendering Definitions schema' (exclude comment)
  # PR 1443 joshmoore 'Genshi ZIP' (label: exclude)
  # PR 1161 sommerc 'Initial CellH5 Reader class' (user: sommerc)
  # PR 1177 rleigh-dundee 'specification: Add metadata for HDF5 embedding' (exclude comment)
  # PR 1500 bjoernthiel 'take new dimensions into account' (user: bjoernthiel)
  # PR 1015 qidane 'Messy binary' (exclude comment)
  # PR 857 melissalinkert 'Initial support for Zeiss .lms files' (label: exclude)
  # PR 858 melissalinkert 'Initial support for Veeco AFM data' (label: exclude)
  # PR 1381 melissalinkert 'Parse physical pixel sizes from CellSens .vsi datasets' (label: exclude)
Updating 2662590..0147338
Previously merged:
  # PR 1497 melissalinkert 'LZW: fix one more off-by-one'

Merged PRs:
  # PR 1407 melissalinkert 'TIFF: fix plane count calculation for pyramids with multiple planes'
  # PR 1492 sbesson 'Command line profiling'
  # PR 1499 rleigh-dundee 'C++: XML validation, writing and wrapper cleanup'
  # PR 1501 rleigh-dundee 'FormatReader/FormatTools Modulo improvements'
  # PR 1502 melissalinkert 'Inveon: fix offsets for files larger than 2GB'
  # PR 1505 rleigh-dundee 'C++: Additional metadata additions'

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

Merged PRs:
  # PR 94 will-moore 'Make Movie script handles units for scalebar'

Repository: openmicroscopy/ome-documentation
Already up-to-date.

Merged PRs:
  # PR 1041 joshmoore 'Units documentation'

Generated by OME-5.1-merge-push#665 (http://ci.openmicroscopy.org/job/OME-5.1-merge-push/665/)