Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

document extra values for omero.fs.repo.path_rules (ticket #10822) #596

Merged
merged 1 commit into from Jan 22, 2014

Conversation

mtbc
Copy link
Member

@mtbc mtbc commented Dec 18, 2013

Fixes https://trac.openmicroscopy.org.uk/ome/ticket/10822 in concert with ome/openmicroscopy#1924.
--no-rebase as FS-specific.

@hflynn
Copy link
Member

hflynn commented Jan 13, 2014

@mtbc can you rebase this to dev_5_0 for review please?

@mtbc
Copy link
Member Author

mtbc commented Jan 13, 2014

Should I first wait for review of ome/openmicroscopy#1924 and the subsequent rebase of that? (I don't know when we start reviewing last year's develop PRs; I guess it depends on the urgency. Right now this PR describes code changes that aren't rebased to 5.0.)

@hflynn
Copy link
Member

hflynn commented Jan 13, 2014

Ah, I think you may need to rebase your code PR too - @sbesson has just given me the impression that we are reviewing dev_5_0 rather than develop until we get 5.0.0 released. But probably best to check with someone.

Unless your code PR is intended for 5.1 rather than 5.0, in which case, ignore my suggestion!

@mtbc
Copy link
Member Author

mtbc commented Jan 13, 2014

Ah, I'd assumed that new PRs should be against dev_5_0 but otherwise we'd just do the usual thing of reviewing on the first, whichever it is, and then rebasing to the other. I'll see if devteam has an opinion ...

@mtbc
Copy link
Member Author

mtbc commented Jan 13, 2014

Looks like dev_5_1 reviews will start this month. (-: Will certainly rebase this docs PR for you to follow the code.

@mtbc
Copy link
Member Author

mtbc commented Jan 21, 2014

This is fine to keep on dev_5_1 only to match the corresponding code PR.

@ximenesuk
Copy link
Contributor

Looks good to merge.

joshmoore added a commit that referenced this pull request Jan 22, 2014
document extra values for omero.fs.repo.path_rules (ticket #10822)
@joshmoore joshmoore merged commit 71ebfa0 into ome:develop Jan 22, 2014
@mtbc mtbc deleted the trac-10822-paths-for-system branch January 22, 2014 16:05
@sbesson sbesson modified the milestones: 5.1.0, 5.1.0-m1 Oct 14, 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.

None yet

5 participants