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.

Sign up for GitHub

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

Jump to bottom

Prepare changes for next psdm release #1107

Closed
danielfeismann opened this issue Jan 15, 2025 · 0 comments · Fixed by #1108
Closed

Prepare changes for next psdm release #1107

danielfeismann opened this issue Jan 15, 2025 · 0 comments · Fixed by #1108
Assignees
@danielfeismann
Labels
dependencies Pull requests that update a dependency file

Comments

@danielfeismann
Copy link
Member

No description provided.

@danielfeismann danielfeismann self-assigned this Jan 15, 2025
@danielfeismann danielfeismann added the dependencies Pull requests that update a dependency file label Jan 15, 2025
@danielfeismann danielfeismann mentioned this issue Jan 29, 2025
Merged
danielfeismann added a commit that referenced this issue Feb 5, 2025
@danielfeismann
Merge branch 'dev' into df/#1107-prepare-changes-for-next-psdm-release
3fe2545 
# Conflicts:
#	CHANGELOG.md
danielfeismann added a commit that referenced this issue Feb 18, 2025
@danielfeismann
Merge branch 'dev' into df/#1107-prepare-changes-for-next-psdm-release
5c1980f 
# Conflicts:
#	CHANGELOG.md
#	src/main/scala/edu/ie3/simona/model/thermal/CylindricalThermalStorage.scala
#	src/main/scala/edu/ie3/simona/model/thermal/ThermalGrid.scala
#	src/test/scala/edu/ie3/simona/test/common/input/HpInputTestData.scala
danielfeismann added a commit that referenced this issue Feb 19, 2025
@danielfeismann
Merge branch 'refs/heads/dev' into df/#1107-prepare-changes-for-next-…
afcee9a 
…psdm-release

# Conflicts:
#	CHANGELOG.md
#	src/test/scala/edu/ie3/simona/model/participant/load/LoadModelScalingSpec.scala
#	src/test/scala/edu/ie3/simona/model/participant/load/ProfileLoadModelSpec.scala
#	src/test/scala/edu/ie3/simona/model/participant/load/RandomLoadModelSpec.scala
#	src/test/scala/edu/ie3/simona/test/common/input/LoadInputTestData.scala
danielfeismann added a commit that referenced this issue Feb 25, 2025
@danielfeismann
Merge branch 'refs/heads/dev' into df/#1107-prepare-changes-for-next-…
51aaff3 
…psdm-release

# Conflicts:
#	CHANGELOG.md
#	src/main/scala/edu/ie3/simona/model/thermal/ThermalGrid.scala
danielfeismann added a commit that referenced this issue Feb 27, 2025
@danielfeismann
Merge branch 'refs/heads/df/#1107-prepare-changes-for-next-psdm-relea…
61ea13d 
…se' into df/#856-tap-water

# Conflicts:
#	src/main/scala/edu/ie3/simona/model/thermal/CylindricalThermalStorage.scala
#	src/main/scala/edu/ie3/simona/model/thermal/ThermalGrid.scala
#	src/test/scala/edu/ie3/simona/model/thermal/ThermalGridWithHouseAndStorageSpec.scala
#	src/test/scala/edu/ie3/simona/model/thermal/ThermalGridWithHouseOnlySpec.scala
#	src/test/scala/edu/ie3/simona/test/common/input/EmInputTestData.scala
#	src/test/scala/edu/ie3/simona/test/common/input/HpInputTestData.scala
staudtMarius added a commit that referenced this issue Feb 27, 2025
@staudtMarius
Merge branch 'dev' into df/#1107-prepare-changes-for-next-psdm-release
81c4e7d
staudtMarius added a commit that referenced this issue Feb 28, 2025
@staudtMarius
Merge branch 'dev' into df/#1107-prepare-changes-for-next-psdm-release
d3050e6
staudtMarius added a commit that referenced this issue Mar 3, 2025
@staudtMarius
Merge branch 'dev' into df/#1107-prepare-changes-for-next-psdm-release
1d003b8
staudtMarius added a commit that referenced this issue Mar 3, 2025
@staudtMarius
Merge branch 'dev' into df/#1107-prepare-changes-for-next-psdm-release
507bc5a
staudtMarius added a commit that referenced this issue Mar 3, 2025
@staudtMarius
Merge pull request #1108 from ie3-institute/df/#1107-prepare-changes-…
591a3d5 
…for-next-psdm-release

Prepare changes for next psdm release
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@danielfeismann danielfeismann

Labels
dependencies Pull requests that update a dependency file
Projects
None yet
Milestone
No milestone
Development

Successfully merging a pull request may close this issue.

Prepare changes for next psdm release ie3-institute/simona
1 participant
@danielfeismann