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.

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

Incorporate heapster-saw into saw-script #1327

Merged
merged 760 commits into from
Jun 24, 2021
Merged

Conversation

glguy
Copy link
Member

@glguy glguy commented Jun 9, 2021

No description provided.

Karl Smeltzer and others added 30 commits July 15, 2020 13:57
@eddywestbrook
Copy link
Contributor

I guess I don't have a strong opinion about how much history to capture, especially since most of the development is in the heapster-saw repo as @glguy suggested. There have certainly been breaking changes in the API of heapster-saw that have required matching changes in saw-script, but I don't think it is crucial to track all of that, especially as a lot of that had to do with matching changes to the Prelude in the saw-core repo, which no longer exists.

To sum up, any squashing on saw-script changes seems fine to me.

@lisanna-dettwyler
Copy link
Contributor

lisanna-dettwyler commented Jun 14, 2021

Notes from this morning:

  • Merge strategy will be squash & archive, so the history will be kept in the repository (perhaps renamed?) and mentioned in the merge request description and merge commit message, but not directly attached to master. I'll take care of the actual git merging for this.
  • Thoughts on branch name, either for this or for things like this that we'd like to keep around? I'd suggest keeping it simple and calling it heapster.
  • Actions integration is still a WIP and I'll spend some time working through it today.

@eddywestbrook
Copy link
Contributor

Well, all the CI passes. Can we finally merge this sucker?

@lisanna-dettwyler lisanna-dettwyler marked this pull request as ready for review June 24, 2021 13:37
Copy link
Contributor

@lisanna-dettwyler lisanna-dettwyler left a comment

Choose a reason for hiding this comment

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

Let's do this

@lisanna-dettwyler lisanna-dettwyler merged commit 09463dd into master Jun 24, 2021
@RyanGlScott RyanGlScott deleted the em/update-sawscript branch March 22, 2024 14:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants