Skip to content

Merge develop into regions#4623

Merged
sbesson merged 120 commits intoome:regionsfrom
dominikl:regions_develop_merge
May 6, 2016
Merged

Merge develop into regions#4623
sbesson merged 120 commits intoome:regionsfrom
dominikl:regions_develop_merge

Conversation

@dominikl
Copy link
Copy Markdown
Member

@dominikl dominikl commented Apr 29, 2016 •
edited
Loading

This PR merges all the recent develop PRs including Ice 3.6. The last merge commit should fix a trivial conflict related to the rebasing of the getROICount PR.

Roger Leigh and others added 30 commits January 19, 2016 11:29
@jburel
build: Add Ice 3.6 support
9c5a844
@jburel
blitz: Remove deprecated omero client stats property
49ec012
@jburel
blitz: Don't use removed getTable_async method
d74a5cb
@jburel
make_data.py: Update comment for Ice 3.6
01cfdac
@jburel
blitz: Catch InvalidSubscriber exception for Ice 3.6
e00260e
@joshmoore @jburel
blitz: Re-enable asynchronous getTable
c53a1fc
@joshmoore @jburel
blitz-test: Add new Glacier methods to MockRouter
f00d8b0
@jburel
omero-icemock: Update to add mock AMD_Router_refreshSession class
c23d39f
@jburel
ConfigImpl: Report bad version format
5e1c9d3
@rleigh-codelibre @jburel
omero-icemock (ice35): Update to add mock AMD_Router_refreshSession c…
a5d2628 
…lass
@jburel
omero-icemock: Add IAdminPrxHelperFactory
2e35033
@joshmoore @jburel
Pass omero.group to getTable
41efc71
@jburel
Only set property for ice 3.5 and before.
e261375
@jburel
Change ciphers
965b79b
@jburel
Change to test build on linux
02a7ead
@jburel
Modify cipher to connect
cbc2cb1
@jburel
Do not set value of Ice.ACM.Client for version >= 3.5
9bbb5a3
@jburel
Add OSX template
11cb344
@jburel
Check ice version and platform.
49d60aa
@jburel
Set properties depending on ice version
a444d24
@jburel
Check os to set ciphers.
e6f2943
@jburel
Add ice 3.6 check
4f95906
@jburel
Fix flake8 issue
fab31c6
@jburel
Merge remote-tracking branch 'origin/develop' into ice36
1b60d66
@jburel
Add call to keepAlive.
3151857
@will-moore
Add paths_to_tag() to show.py
4c525e3
@will-moore
ome.tree.js and views.py use paths_to_tag()
a3c95a2
@will-moore
Show() class supports 'tagset' objects
2f3d5a9
Update OMERO Build to consume BF5.1.9-snapshot
67b0600
@will-moore
Add tagset tests to test_show.py
2f47c66
joshmoore and others added 15 commits April 26, 2016 20:47
@joshmoore
Merge pull request ome#4594 from jburel/session-test
42da31d 
Session test
@joshmoore
Merge pull request ome#4596 from jburel/well-status
c1c339c 
Status field
@jburel
Merge pull request ome#4534 from will-moore/show_tag_tagset
4dbd05f 
Show tag tagset
@jburel
Merge pull request ome#4602 from dominikl/get_roi_count_develop
266f52c 
Get ROI count
@atarkowska
clean up pid file
8515a81
@atarkowska
revert ldap plugin
6aca01b
@snoopycrimecop
Update develop submodules
cd9e993 
Repository: openmicroscopy/openmicroscopy
Already up-to-date.

Repository: ome/scripts
Updating d1bbb59..1de4a24
Previously merged:
  # PR 111 will-moore 'kymograph_script_getDataset'

Generated by OMERO-DEV-latest-submods#202 (https://ci.openmicroscopy.org/job/OMERO-DEV-latest-submods/202/)
@jburel
Merge pull request ome#4535 from bramalingam/OMERO_BF5_1_9_Snapshot
9ccd1a3 
Update OMERO Build to consume BF5.1.9
@jburel
Merge pull request ome#4601 from aleksandra-tarkowska/deprecate_windows
cc7539b 
Deprecate windows
@jburel
Merge pull request ome#4599 from snoopycrimecop/develop/latest/submod…
7c78e87 
…ules

Update develop submodules
@jburel
Merge pull request ome#4578 from sbesson/ome_omero_apidoc_3
dbcc595 
Copy ome.api.* documentation to omero.api.* (3)
@jburel
Merge pull request ome#4604 from aleksandra-tarkowska/foreground
cda8446 
web start --foreground
@joshmoore
Merge pull request ome#4452 from jburel/ice36
56e71c2 
Ice 3.6
@dominikl
Merge branch 'develop' into regions_develop_merge
9a3d680 
Conflicts:
	components/insight/SRC/org/openmicroscopy/shoola/env/data/views/ImageDataViewImpl.java
@dominikl
Remove duplicate method
1b6e56f
@dominikl dominikl mentioned this pull request Apr 29, 2016
Closed
@dominikl dominikl closed this Apr 29, 2016
@dominikl dominikl reopened this Apr 29, 2016
@mtbc
Copy link
Copy Markdown
Member

mtbc commented May 2, 2016

No remaining changes after ImageDataViewImpl conflict. Duplicate removed in 1b6e56f indeed already has same method in regions. Once we get a successful run of http://regions-ci.docker.openmicroscopy.org:8080/ I'd say we are good to merge.

@sbesson
Copy link
Copy Markdown
Member

sbesson commented May 5, 2016

Discussed with @jburel @dominikl @mtbc, it seems that porting the Ice 3.6 PR will require additional test modifications similar to the ones done in #4594 (for the tests added specifically for OMERO 5.3.0). @mtbc will investigate these tests. In the meantime, we should be able to fix the conflicts between develop and regions without including Ice 3.6 into the question by merging cda8446 into regions. Closing this PR to re-open a new one.

@sbesson sbesson closed this May 5, 2016
@dominikl
Copy link
Copy Markdown
Member Author

dominikl commented May 5, 2016

Replaced by #4632

@sbesson sbesson reopened this May 5, 2016
This was referenced May 5, 2016
Closed
Merged
@sbesson
Copy link
Copy Markdown
Member

sbesson commented May 6, 2016

Tested the ROI count functionality. Worked as expected. All integration tests are passing. Merging.

@sbesson sbesson merged commit 87510c8 into ome:regions May 6, 2016
@sbesson sbesson added this to the 5.3.0 milestone May 10, 2016
@dominikl dominikl deleted the regions_develop_merge branch May 3, 2017 09:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

regions

Projects

None yet

Milestone

5.3.0

Development

Successfully merging this pull request may close these issues.

9 participants

@dominikl @mtbc @sbesson @joshmoore @rleigh-codelibre @jburel @will-moore @atarkowska @snoopycrimecop