Skip to content

Fixes for issues #2385, #2490 and #2499 #2497

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
Merged
merged 3 commits into from
Apr 11, 2018
Merged

Fixes for issues #2385, #2490 and #2499 #2497

merged 3 commits into from
Apr 11, 2018

Conversation

@hubertus65
Copy link
Member

@hubertus65 hubertus65 commented Apr 6, 2018 •
edited by beutlich
Loading

Fixes for issues #2490 (a one letter typo) and #2385 (a one letter typo that is significant, a wrong assert).

Close #2490. Close #2385. Close #2499.

@hubertus65 hubertus65 requested a review from dietmarw April 6, 2018 16:38
@dietmarw
Copy link
Member

dietmarw commented Apr 6, 2018

I'd like to have @beutlich to have another look at it for the #2385 fix especially.

@dietmarw dietmarw requested a review from beutlich April 6, 2018 17:41
dietmarw
dietmarw requested changes Apr 6, 2018
View reviewed changes
Copy link
Member

@dietmarw dietmarw left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah there is one problem with this pull request. It needs to merge into master not the erroneous modelica:fixesforMedia3.2.3 branch.

@dietmarw dietmarw changed the base branch from fixesforMedia3.2.3 to master April 6, 2018 17:59
@dietmarw
Copy link
Member

dietmarw commented Apr 6, 2018

Just found out that GitHub lets you easily fix the base of the Pull Request. So I fixed it.

@dietmarw dietmarw changed the base branch from master to fixesforMedia3.2.3 April 6, 2018 18:01
@dietmarw dietmarw changed the base branch from fixesforMedia3.2.3 to master April 6, 2018 18:02
@dietmarw
Copy link
Member

dietmarw commented Apr 6, 2018

In case you wonder how that is done:
peek 2018-04-06 20-02

@beutlich beutlich changed the title Fixes for Issues #2490 (a one letter typo) and #2385 (a one letter ty… Fixes for Issues #2490 and #2385 Apr 9, 2018
@dietmarw dietmarw added the L: Media Issue addresses Modelica.Media label Apr 9, 2018
@beutlich beutlich force-pushed the fixesforMedia3.2.3 branch from 823d127 to c577831 Compare April 11, 2018 07:27
beutlich
beutlich approved these changes Apr 11, 2018
View reviewed changes
Copy link
Member

@beutlich beutlich left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In general atomic commits with proper git commit messages are to be prefered. See https://gist.github.com/digitaljhelms/3761873#commit-messages for some guideline.

I updated the commit messages and also addressed #2499 by another commit.

@beutlich beutlich changed the title Fixes for Issues #2490 and #2385 Fixes for issues #2385, #2490 and #2499 Apr 11, 2018
@beutlich beutlich added this to the maintenance milestone Apr 11, 2018
@beutlich beutlich merged commit 3a9ceff into modelica:master Apr 11, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@dietmarw dietmarw dietmarw approved these changes

@beutlich beutlich beutlich approved these changes

Assignees

No one assigned

Labels

L: Media Issue addresses Modelica.Media

Projects

None yet

Milestone

maintenance

Development

Successfully merging this pull request may close these issues.

3 participants

@hubertus65 @dietmarw @beutlich