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

systemvm: Fix regression from fwd-merging PR #1766 #1788

Merged
merged 1 commit into from Nov 27, 2016

Conversation

rohityadavcloud
Copy link
Member

Fixes merge conflict issue incorrectly fixed during a fwd-merge in 825935
from PR #1766.

Fixes merge conflict issue incorrectly fixed during a fwd-merge in 825935
from PR apache#1766

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
@rohityadavcloud
Copy link
Member Author

@blueorangutan package

@blueorangutan
Copy link

@rhtyd a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.

@rohityadavcloud
Copy link
Member Author

Merging this based on internal tests, the issue was tuple did not include lease. Merging this now.

@asfgit asfgit merged commit cc72e4d into apache:4.9 Nov 27, 2016
asfgit pushed a commit that referenced this pull request Nov 27, 2016
systemvm: Fix regression from fwd-merging PR #1766Fixes merge conflict issue incorrectly fixed during a fwd-merge in 825935
from PR #1766.

* pr/1788:
  systemvm: Fix regression from 825935

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
@blueorangutan
Copy link

Packaging result: ✖centos6 ✔centos7 ✔debian. JID-259

@rohityadavcloud
Copy link
Member Author

Notes: centos6 build failed due to an intermittent unit test that fails sometimes when clocks are skewed: HypervisorUtilsTest.checkVolumeFileForActivityTest:68 Didn't block long enough, expected at least 2000 and got 1061

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.

None yet

3 participants