Subtree push from int1.3.1 update on FIU-algorithm repo #13
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
Merge branch 'deve' into cda
Merge branch 'deve' into cda
Merge branch 'deve' into cda # Conflicts: # Dockerfile # flow/flow.erf/flow.erf.R
Merge remote-tracking branch 'upstream/deve' into cdaMerge # Conflicts: # Dockerfile # ext/eddy4R/pack/eddy4R.base/R/def.base.ec.R # flow/flow.erf/flow.erf.R
Merge branch 'deve' into cdaMerge
bug fix to change number of available data
Merge commit '4d966cfd8aa005aa225fe787a1d4be6b3bc86771' into deve-rft # Conflicts: # ext/eddy4R/pack/eddy4R.stor/R/wrap.dp01.ecse.R # ext/eddy4R/pack/eddy4R.stor/R/wrap.prd.day.ecse.R # ext/eddy4R/pack/eddy4R.stor/man/wrap.dp01.ecse.Rd # ext/eddy4R/pack/eddy4R.stor/man/wrap.prd.day.ecse.Rd
Merge commit '931909e924839d721089c43890598442657af9ff' into deve # Conflicts: # ext/eddy4R/.travis.yml
…a to get rid of spike
- Adding vignette to eddy4R repo
Merge remote-tracking branch 'upstream/deve' into valiH2o
…in the picarro data products
… that get standard weights don't need to be specified by name
…florian1 into crdQmBeta
merge deve updates into 1.3.0 for rc5 release
… and meas values, removing data if the valiEvalThsh is -1
…patterns that are not caught by the evaluation regression check
adding slope thresholding back to validation
…orrecting total time for qfqm and ucrt
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.
No description provided.