merge develop -Dorg -Ssuccess-only: PR 3156 (Templates cleanup)
merge develop -Dorg -Ssuccess-only: PR 3157 (Reset password)
merge develop -Dorg -Ssuccess-only: PR 3207 (General pane web 2)
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 3218 (Units metadata panel)
merge develop -Dorg -Ssuccess-only: PR 3221 (Wrap description text to avoid horizontal scroll bar)
merge develop -Dorg -Ssuccess-only: PR 3228 (fix #11779: graph operations use "compiler" rather than "rollback" strategy)
merge develop -Dorg -Ssuccess-only: PR 3229 (Use Units in ROI/MeasurementTool)
merge develop -Dorg -Ssuccess-only: PR 3236 (Fix 'Save to All' in Preview panel)
merge develop -Dorg -Ssuccess-only: PR 3237 (Fix web attachment error msg develop)
merge develop -Dorg -Ssuccess-only: PR 3239 (Flake8 top-level OmeroWeb components)
merge develop -Dorg -Ssuccess-only: PR 3245 (Get pixels size units)
merge develop -Dorg -Ssuccess-only: PR 3247 (C++ green 2)
merge develop -Dorg -Ssuccess-only: PR 3248 (once map key is found, can stop looking)
merge develop -Dorg -Ssuccess-only: PR 3249 (Tables set all metadata 12606)
merge develop -Dorg -Ssuccess-only: PR 3256 (Increase Limit)
merge develop -Dorg -Ssuccess-only: PR 3259 (Ignore units on FontSize in shapeMarshall)
merge develop -Dorg -Ssuccess-only: PR 3260 (mock object)
merge develop -Dorg -Ssuccess-only

Repository: openmicroscopy/openmicroscopy
Excluded PRs:
  # PR 3181 joshmoore 'Update to Hibernate 3.6 (See trac2570)' (label: exclude breaking)
  # PR 2363 dominikl 'Java Gateway API' (label: exclude breaking)
  # PR 3098 aleksandra-tarkowska 'Metadata reimport' (label: exclude)
  # PR 3042 will-moore 'Download dataset project' (label: exclude)
  # PR 3141 dpwrussell 'jstree upgrade (Functionality Review Only)' (exclude comment)
  # PR 2585 aleksandra-tarkowska 'making time_zone and first_day_of_week configurable' (exclude comment)
  # PR 3216 joshmoore 'Misc DB fixes (5.1DEV__17)' (label: breaking)
  # PR 3000 jballanc 'Update artifacts for Lucene, Hibernate, and Spring' (user: jballanc)
  # PR 2182 joshmoore 'Read only flag' (label: exclude)
  # PR 3086 will-moore 'Create image by tiling 12459' (label: exclude)
Already up-to-date.

Merged PRs:
  # PR 3156 aleksandra-tarkowska 'Templates cleanup'
  # PR 3157 jburel 'Reset password'
  # PR 3207 will-moore 'General pane web 2'
  # PR 3208 sbesson 'Update the OMERO install script to test Web login with CSRF (rebased onto develop)'
  # PR 3218 will-moore 'Units metadata panel'
  # PR 3221 dominikl 'Wrap description text to avoid horizontal scroll bar'
  # PR 3228 mtbc 'fix #11779: graph operations use "compiler" rather than "rollback" strategy'
  # PR 3229 dominikl 'Use Units in ROI/MeasurementTool'
  # PR 3236 will-moore 'Fix 'Save to All' in Preview panel'
  # PR 3237 zeb 'Fix web attachment error msg develop'
  # PR 3239 sbesson 'Flake8 top-level OmeroWeb components'
  # PR 3245 will-moore 'Get pixels size units'
  # PR 3247 joshmoore 'C++ green 2'
  # PR 3248 mtbc 'once map key is found, can stop looking'
  # PR 3249 manics 'Tables set all metadata 12606'
  # PR 3256 jburel 'Increase Limit'
  # PR 3259 will-moore 'Ignore units on FontSize in shapeMarshall'
  # PR 3260 jburel 'mock object'
Conflicting PRs (not included):
  # PR 3254 snoopycrimecop 'Update develop submodules'

Repository: openmicroscopy/bioformats
Excluded PRs:
  # PR 1443 joshmoore 'Genshi ZIP' (label: exclude)
  # PR 1015 qidane 'Messy binary' (exclude comment)
  # PR 1309 melissalinkert 'Allow tile-based access of large JPEG-2000 images' (exclude comment)
  # PR 1161 sommerc 'Initial CellH5 Reader class' (user: sommerc)
  # PR 1458 sbesson 'Fix Javadocs warnings' (label: exclude)
  # PR 1426 qidane 'Initial Rendering Definitions schema' (exclude comment)
  # PR 857 melissalinkert 'Initial support for Zeiss .lms files' (label: exclude)
  # PR 1381 melissalinkert 'Parse physical pixel sizes from CellSens .vsi datasets' (label: exclude)
  # PR 858 melissalinkert 'Initial support for Veeco AFM data' (label: exclude)
  # PR 1177 rleigh-dundee 'specification: Add metadata for HDF5 embedding' (exclude comment)
Updating b3962bd..5ddef64
Previously merged:
  # PR 1469 rleigh-dundee 'cpp: bioformats: Correct placement of warning pragmas in PixelProperties'
  # PR 1467 rleigh-dundee 'cmake: Replace FindXerces with FindXercesC'
  # PR 1459 jburel 'Fix writing of tiff description'
  # PR 1462 sbesson 'Add bash script for updating copyright headers'
  # PR 1463 sbesson 'Add script to bump version numbers'
  # PR 1365 ctrueden 'PrairieView 5.2 fixes and improvements'
  # PR 1437 stelfrich 'Changed handling of empty series names in ND2 files'
  # PR 1456 mtbc 'add note about using mvn eclipse:eclipse'
  # PR 1454 rleigh-dundee 'C++: Autoload schema catalogues and set up environment for tests'
  # PR 1366 ctrueden 'Miscellaneous cleanup'
  # PR 1452 joshmoore 'Use __import__ for generateDS to handle FS case issues'
  # PR 1448 melissalinkert 'Metamorph: allow both sanitized and unsanitized delimiters'
  # PR 1455 sbesson 'Remove source code hyperlinks from Java source files'
  # PR 1453 jburel 'Fix mock object to match changes from int to double for channel'
  # PR 1435 joshmoore 'Ordered MapPairs implementation'
  # PR 1441 melissalinkert 'Fix OME-XML BinData decoding'
  # PR 1444 snoopycrimecop 'Update auto-generated documentation'
  # PR 1431 rleigh-dundee 'Specification: Add XML catalogues for released schemas'
  # PR 1450 melissalinkert 'Reduce memory needed to open PNG images'
  # PR 1451 melissalinkert 'Fix im3 metadata'

Merged PRs:
  # PR 1407 melissalinkert 'TIFF: fix plane count calculation for pyramids with multiple planes'
  # PR 1420 qidane 'Updating samples and adding units samples'
  # PR 1442 bramalingam 'Update roi handler'
  # PR 1457 melissalinkert 'IM3: fix memoization and whitespace'
  # PR 1460 rleigh-dundee 'C++: Implement MetadataConverter'
  # PR 1461 csachs 'Changed ND2 metadata string handling to work properly with empty strings'
  # PR 1465 melissalinkert 'NDPI: fix tile offset adjustment for files larger than 4GB'
  # PR 1468 rleigh-dundee 'C++: binary build and showinf fixes'
  # PR 1471 jburel 'mock object'

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

Repository: openmicroscopy/ome-documentation
Updating fb16f30..a3e7d3e
Previously merged:
  # PR 1044 hflynn 'Faq stuff'
  # PR 1047 manics 'Web iis docs'
  # PR 1049 snoopycrimecop 'Update auto-generated properties'
  # PR 1045 ximenesuk 'Explain default Python tests.'
  # PR 1046 hflynn 'Removing IDelete api link as service deleted'
  # PR 1048 snoopycrimecop 'Update auto-generated properties'

Merged PRs:
  # PR 1038 aleksandra-tarkowska 'updating web doc for embedding viewer'
  # PR 1041 joshmoore 'Units documentation'
  # PR 1042 mtbc 'document graph traversal reimplementation for developers'

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