Merging master into issue1707 #1821
Merged
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
Issue 1760 correct broken links
For #1762. This corrects the variability as assigning an input to a parameter is not allowed
…ca-ibpsa into issue1754_ATESmodel
Bumps [urllib3](https://github.com/urllib3/urllib3) from 1.26.17 to 1.26.18. - [Release notes](https://github.com/urllib3/urllib3/releases) - [Changelog](https://github.com/urllib3/urllib3/blob/main/CHANGES.rst) - [Commits](urllib3/urllib3@1.26.17...1.26.18) --- updated-dependencies: - dependency-name: urllib3 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]>
…c/fluid/heatpumps/calibration/doc/urllib3-1.26.18 Bump urllib3 from 1.26.17 to 1.26.18 in /IBPSA/Resources/src/fluid/heatpumps/calibration/doc
This is needed for merging the model to other libraries
Added full class path
This adds more information to the top-level documentation of IBPSA.Examples
Updated documentation of Examples package
Added missing annotation for medium selection in ISO13790 zone model
…mentation Issue1810 missing negative sign documentation
This changes the repository for the docker images
For #1814. This function cannot be called inside a function
Added missing header file declaration
Corrected wrong use of getInstanceName()
Added header files and ifdef statements
mwetter
approved these changes
Jan 4, 2024
There was a problem hiding this comment.
@amaccarini
This merges the master to the development branch, which you can always do without a review. We just need reviews to make changes to the master as the master should always be stable and correct.
|
Perfect, thanks @mwetter. Good to know that no review is required for this type of merge. |
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.
This is just to update the branch issue1707_UpdatesISO13790