Skip to content

Restart system vms to MASTER - #80

Closed
andrijapanicsb wants to merge 6 commits into
masterfrom
restart-system-VMs
Closed

andrijapanicsb wants to merge 6 commits into
masterfrom
restart-system-VMs

Conversation

@andrijapanicsb

Copy link
Copy Markdown
Contributor

@PaulAngus this one contains same "include rebooting systemsVM" as PR #79 , but here also your own changes around guest OS customisation (and some headers and references chagnes) are included.
I believe this is all required for master.
Later we'll need to update versions to 4.14 etc (one it's out)

@PaulAngus

Copy link
Copy Markdown
Member

@andrijapanicsb - I've merged 4.13 branch into master, can you rebase this PR to see what (if any) 'changes' are left

@andrijapanicsb
andrijapanicsb changed the base branch from master to 4.12 October 30, 2019 21:41
@andrijapanicsb
andrijapanicsb changed the base branch from 4.12 to master October 30, 2019 21:41
@andrijapanicsb

Copy link
Copy Markdown
Contributor Author

Done @PaulAngus

@apache apache deleted a comment from ACSGitBot Oct 30, 2019
@apache apache deleted a comment from ACSGitBot Oct 30, 2019
@ACSGitBot

Copy link
Copy Markdown

Your request had been received, i'll go and build the documentation and check the output log for errors.

This shouldn't take long.

@andrijapanicsb andrijapanicsb changed the title Restart system vms + plus SOME MORE Restart system vms to MASTER Oct 30, 2019
@ACSGitBot

Copy link
Copy Markdown

Build finished. You can review it at: https://acs-www.shapeblue.com/docs/pr80

Build Log Output:

No log errors found to report.

@PaulAngus PaulAngus left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM

@PaulAngus

Copy link
Copy Markdown
Member

Should this not go into 4.13 so that we can forward merge?

@andrijapanicsb

Copy link
Copy Markdown
Contributor Author

@PaulAngus I've made originally a PR against 4.13 as well - currently contains identical commits - so if you are OK, we can merge both PR?

@PaulAngus

Copy link
Copy Markdown
Member

Are you saying that the content of the commit is the same or that the commit SHA is the same? @andrijapanicsb

@andrijapanicsb

Copy link
Copy Markdown
Contributor Author

6 commits each, same SHA:

image

@andrijapanicsb

Copy link
Copy Markdown
Contributor Author

merged to 4.13, merged forward to master - so closing this one.

@andrijapanicsb
andrijapanicsb deleted the restart-system-VMs branch May 1, 2020 15:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants