Merge dev into stage #249
Closed
Merge dev into stage #249
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
Upgrade Django
Engage 126 - Enable flower container
Engage 120/130 Solver Access Management
Bumps [django](https://github.com/django/django) from 4.2.16 to 4.2.17. - [Commits](django/django@4.2.16...4.2.17) --- updated-dependencies: - dependency-name: django dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>
Adding a number of enhancements from HPC work to gradient Transmission (links) gradient support Support for systemwide energy cap constraints on techs Fixing issue where copying the 'energy_cap_per_storage_cap' constraint would cause an infeasible run with rounded capacities
Set calliope logging critical verbosity
…4.2.17 Bump django from 4.2.16 to 4.2.17 in /calliope_app
…remove-quotes engage-164 set weights values to be numbers
Engage158 - highs solver log_to_console=False
…abled engage183 - Set Clustered run default False
Gradient links and storage fix
Collaborator
Author
|
FYI @hannamocha It seems too many conflicts, would not show on this page, and need to resolve using command lines. I'll skip the conflicts resolving at this time due to the budget limit. Simply re-deploy stage env with the old stage branch to solve the KEVs on the server. |
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.
Merge and re-deploy stage for vulnerability fixes.