Merge from onprc19.1 & onprc19.1Prod r.63271 to 65949 #64
Conversation
This file contains hidden or 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
This was referenced Oct 12, 2020
labkey-jeckels
approved these changes
Oct 12, 2020
bbimber
requested changes
Oct 13, 2020
|
|
||
| getJob().getLogger().debug("creating readdata"); | ||
| Table.insert(getJob().getUser(), readDataTable, rd); | ||
| if (rd.getFileId1() == null) |
Collaborator
There was a problem hiding this comment.
Do you have any info on why this needed?
There was a problem hiding this comment.
I tracked it down to revision 44984 in the onprc15.2 branch in March 2017. It was committed by Raymond with the comment "support for genetic ancestry data. Author: B.Bimber"
It looks like it got dropped somewhere in a discvrX branch before being merged into trunk. I'll roll it back.
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.
Rationale
Merge changes from onprc19.1 r.63271 to 65757
Merge changes from onprc19.1Prod r. 65762 to 65949
Related Pull Requests
LabKey/onprcEHRModules#32
LabKey/platform#1626
LabKey/ehrModules#74
LabKey/LabDevKitModules#55
https://github.com/LabKey/sampleManagement/pull/381
https://github.com/LabKey/biologics/pull/712
https://github.com/LabKey/labbook/pull/53
LabKey/wnprc-modules#38