Skip to content
This repository has been archived by the owner on Sep 27, 2023. It is now read-only.

Master beauharnois-13 #786

Merged
merged 15 commits into from
Oct 27, 2020
Merged

Master beauharnois-13 #786

merged 15 commits into from
Oct 27, 2020

Conversation

aivanova5
Copy link
Collaborator

@aivanova5 aivanova5 commented Oct 20, 2020 •
edited
Loading

This PR stage beauharnois-13 (4.2.13) merge into master

Current issues

None

Code changes

Documentation changes

None

Test and Validation Notes

  • Removed erroneous assert values in market/autotest/test_dutycycle_CPP.glm

dchassin and others added 12 commits October 16, 2020 11:41
@dchassin
Moved modules to a single module folder
cdb8afb
@aivanova5
Merge branch 'develop' into develop-create-module-folder
706bd03
@aivanova5
Update version.h
ffb2516
@aivanova5
Merge branch 'master' into develop
1cc3dab
@aivanova5
Update version.h
af01018
@dchassin @aivanova5
Update json2md.py (#779)
b8d23cd 
* Update json2md.py

* Create Markdown_docs.md

* Update json2md.py

* Update test_markdown.glm

* Create test_markdown.md

* Update Markdown_docs.md

Co-authored-by: Alyona Teyber <Ivanova.alyona5@gmail.com>
@dchassin @aivanova5
Update object.cpp (#777)
4376e34 
* Update object.cpp

* Fix interval update serrro in postsync for group_recorder

* Update object.cpp

* Update exec.cpp

Co-authored-by: Alyona Teyber <Ivanova.alyona5@gmail.com>
@aivanova5
Revert "Update object.cpp (#777)"
f84093d 
Reverting problematic merge
This reverts commit 4376e34.
@dchassin @aivanova5
Develop fix save conversion (#780)
6da4443 
* Update main.cpp

* Update save.cpp

* Revert "Update object.cpp (#777)"

This reverts commit 4376e34.
Reverting problematic PR

Co-authored-by: Alyona Teyber <Ivanova.alyona5@gmail.com>
@aivanova5 @dchassin
Develop fix realtime lockup - rev2 (#787)
09c3568 
* Update object.cpp

* Fix interval update serrro in postsync for group_recorder

* Update object.cpp

* Update exec.cpp

* Update zipload.cpp

* Update dutycycle_CPP_player.player

Co-authored-by: David P. Chassin <dchassin@slac.stanford.edu>
Co-authored-by: root <david.chassin@me.com>
@aivanova5
Merge branch 'develop' into develop-create-module-folder
594481b 
Merging with develop
@aivanova5
Merge branch 'develop-create-module-folder' into develop
e5858f9 
Merging with develop
@dchassin dchassin marked this pull request as ready for review October 26, 2020 22:21
@dchassin
Update README.md (#788)
9b6330c 
* Update README.md

* Update README.md

* Update README.md
@dchassin
Update README.md
33d52f5
@dchassin
Update README.md
670c4ac
@aivanova5 aivanova5 merged commit 208f732 into master Oct 27, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@dchassin dchassin dchassin approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@aivanova5 @dchassin