Skip to content

[Linux] Sync callbacks after rebase on master#977

Merged
jrbriggs merged 1 commit intomicrosoft:features/linuxprototypefrom
github:linux-rebase-callback-sync
Apr 1, 2019
Merged

[Linux] Sync callbacks after rebase on master#977
jrbriggs merged 1 commit intomicrosoft:features/linuxprototypefrom
github:linux-rebase-callback-sync

Conversation

@chrisd8088
Copy link
Contributor

@chrisd8088 chrisd8088 commented Mar 29, 2019 •
edited
Loading

@jrbriggs ... This is the small followup to #976 which syncs the Linux implementations of MirrorProvider and VirtualizationInstance against the recent changes to the Mac equivalents, as introduced in cada100.

Just FYI, after the rebase is done, I wouldn't too be surprised if we get a merge conflict from this.

@chrisd8088 chrisd8088 mentioned this pull request Mar 29, 2019
Closed
@chrisd8088 chrisd8088 changed the title Linux rebase callback sync Sync Linux callbacks after rebase Mar 29, 2019
@chrisd8088 chrisd8088 force-pushed the linux-rebase-callback-sync branch from 76c4669 to da81303 Compare March 29, 2019 08:19
@chrisd8088
Copy link
Contributor Author

chrisd8088 commented Mar 29, 2019

There's the CI bug again; hopefully the rebase in #976 will get rid of that!

@chrisd8088 chrisd8088 changed the title Sync Linux callbacks after rebase [Linux] Sync callbacks after rebase from #976 Mar 29, 2019
@chrisd8088 chrisd8088 changed the title [Linux] Sync callbacks after rebase from #976 [Linux] Sync callbacks after rebase on master Mar 29, 2019
@chrisd8088 chrisd8088 mentioned this pull request Mar 30, 2019
Closed
@jrbriggs jrbriggs force-pushed the features/linuxprototype branch from 1a9d03a to 82113eb Compare April 1, 2019 13:12
@chrisd8088
add Linux stubs for logging and pre-hydration
13d5dd0 
Add stub callbacks to align with the addition of OnLogError()
and OnFilePreConvertToFull() to the Mac implementation in
commits cada100..2dc3b04.

Also add simple callbacks to the Linux MirrorProvider to match.
@chrisd8088 chrisd8088 force-pushed the linux-rebase-callback-sync branch from da81303 to 13d5dd0 Compare April 1, 2019 17:12
@chrisd8088
Copy link
Contributor Author

chrisd8088 commented Apr 1, 2019

Hi @jrbriggs -- well, this is up-to-date and ready, I think, despite the CI failure; this time it appears to be due to a timeout from the GVFS cache server:

Unable to query /gvfs/config
Server returned error code 503 (ServiceUnavailable)

So as before, I'm confident this has nothing to do with the changes in this PR, at least.

@jrbriggs
Copy link
Member

jrbriggs commented Apr 1, 2019

/azp run PR - Windows - Functional Tests

@azure-pipelines
Copy link

azure-pipelines bot commented Apr 1, 2019

Azure Pipelines successfully started running 1 pipeline(s).

@chrisd8088
Copy link
Contributor Author

chrisd8088 commented Apr 1, 2019

Huzzah! Thanks for the re-run, @jrbriggs!

@jrbriggs jrbriggs merged commit 46206ae into microsoft:features/linuxprototype Apr 1, 2019
@chrisd8088 chrisd8088 deleted the linux-rebase-callback-sync branch April 1, 2019 20:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@chrisd8088 @jrbriggs