Remove duplicate postgres startup #11793 (rebased onto dev_4_4) #1881
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Ie8 fixes 8713 develop
…evelop Blitz param types 11637 develop
Upgrade ICE jars to version 3.5.1
Add roi intensity results view
Related nodes
Keep selection import as
Floating dialog
Script parameter
Repository: openmicroscopy/openmicroscopy Already up-to-date. Repository: openmicroscopy/bioformats Updating e9c850d..9bc1862 Merged PRs (fast-forward): # PR 812 mtbc 'publish lwf-stubs JAR for lurawave' # PR 809 hflynn 'Tidying ITK user doc page' Repository: ome/scripts Already up-to-date. Repository: openmicroscopy/ome-documentation Updating d07020b..b13a649 Merged PRs (fast-forward): # PR 568 sbesson 'Submodule dependency fix' # PR 565 sbesson 'Add paragraph about GitHub 2FA and scc commands' # PR 561 hflynn 'Adding ILdap as requested by Ola (rebased onto develop)' # PR 564 jballanc 'Remove duplicate entries for "blitz" component. (rebased onto develop)' # PR 558 hflynn 'Tidying script docs & using git links' Generated by OMERO-submods-develop#255 (http://hudson.openmicroscopy.org.uk/job/OMERO-submods-develop/255/)
Allow fast finish up travis builds
Update develop submodules
Bio-Formats dependency on lwf-stubs JAR for lurawave
Worked around method_decorator problem with custom getattr
Fix intermittent test failures in OmeroPy-integration-stable. (rebased onto develop)
Brightness
fix #11465: properly populate roles proxy object
Add `--match v.[0-9]*` to `git describe`
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is the same as gh-1873 but rebased onto dev_4_4.
OMERO-homebrew-develop and OMERO-homebrew-STABLE regularly failed because Postgres was being started twice.
Note this requires changes to the jenkins job- since the postgres data dir is explicitly set it is necessary to run
/usr/local/bin/pg_ctl -D$PSQL_DIR -m fast stopinstead of/usr/local/bin/brew services stop postgres. Try runnning this job a few times to check it works.