Skip to content

Update dev_5_0 submodules#2845

Merged
sbesson merged 1 commit intoome:dev_5_0from
snoopycrimecop:merge/dev_5_0/submodules
Jul 26, 2014
Merged

Update dev_5_0 submodules#2845
sbesson merged 1 commit intoome:dev_5_0from
snoopycrimecop:merge/dev_5_0/submodules

Conversation

@snoopycrimecop
Copy link
Copy Markdown
Member

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

Repository: openmicroscopy/bioformats
Updating 141a8e4..bdf8fe7
Merged PRs (fast-forward):

PR 1236 sbesson 'Prepend Maven central in the pluginRepositories block'

PR 1228 rleigh-dundee 'Using Bio-Formats: Add gradle and maven instructions'

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

Repository: openmicroscopy/ome-documentation
Updating 10293bf..f827f46
Merged PRs (fast-forward):

PR 911 bpindelski 'Deprecate omero_client.jar.'

PR 900 sbesson 'OMERO configuration properties'

PR 910 ximenesuk 'Document CLI command fs'

PR 903 will-moore 'Add switch-group info to user CLI page'

PR 896 joshmoore 'Remove limitations'

PR 902 sbesson '5.0.3: CLI documentation (rebased onto develop) (rebased onto dev_5_0)'

PR 894 sbesson 'Added documentation for Active Directory LDAP'

PR 893 joshmoore 'Fine tune config'

PR 897 sbesson 'Update auto-generated properties'

Generated by build OMERO-5.0-latest-submods#458.


--no-rebase

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

Repository: openmicroscopy/bioformats
Updating 141a8e4..bdf8fe7
Merged PRs (fast-forward):
  # PR 1236 sbesson 'Prepend Maven central in the pluginRepositories block'
  # PR 1228 rleigh-dundee 'Using Bio-Formats: Add gradle and maven instructions'

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

Repository: openmicroscopy/ome-documentation
Updating 10293bf..f827f46
Merged PRs (fast-forward):
  # PR 911 bpindelski 'Deprecate omero_client.jar.'
  # PR 900 sbesson 'OMERO configuration properties'
  # PR 910 ximenesuk 'Document CLI command fs'
  # PR 903 will-moore 'Add switch-group info to user CLI page'
  # PR 896 joshmoore 'Remove limitations'
  # PR 902 sbesson '5.0.3: CLI documentation (rebased onto develop) (rebased onto dev_5_0)'
  # PR 894 sbesson 'Added documentation for Active Directory LDAP'
  # PR 893 joshmoore 'Fine tune config'
  # PR 897 sbesson 'Update auto-generated properties'

Generated by OMERO-5.0-latest-submods#458 (http://ci.openmicroscopy.org/job/OMERO-5.0-latest-submods/458/)
@sbesson
Copy link
Copy Markdown
Member

sbesson commented Jul 26, 2014

Merging for 5.0.3-rc2

sbesson added a commit that referenced this pull request Jul 26, 2014
@sbesson sbesson merged commit 54c6721 into ome:dev_5_0 Jul 26, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants