Skip to content

Conversation

@kesselb
Copy link
Collaborator

@kesselb kesselb commented Oct 4, 2020

Backport of #240

Cast swapFree to integer to fix typeerror.
Prevent float in swapinfo and update tests for hw.realmem

(cherry picked from commit 49952d2)

* Fix Memory

Cast swapFree to integer to fix typeerror.

Fix total memory to use hw.realmem

Signed-off-by: Matthew Wener <[email protected]>
Signed-off-by: Matthew Wener <[email protected]>

* Prevent float in swapinfo and update tests for hw.realmem

Signed-off-by: Matthew Wener <[email protected]>
Signed-off-by: Matthew Wener <[email protected]>

* Update testGetMemoryNoSwapinfo to hw.realmem

Signed-off-by: Matthew Wener <[email protected]>
(cherry picked from commit 49952d2)
Signed-off-by: Daniel Kesselberg <[email protected]>
@kesselb kesselb force-pushed the backport/240/stable20 branch from dffae94 to b8bfc26 Compare October 4, 2020 10:49
@kesselb kesselb added this to the Nextcloud 20.0.1 milestone Oct 4, 2020
@kesselb kesselb changed the title Fix Memory (#240) [20] Fix Memory (#240) Oct 4, 2020
@nickvergessen nickvergessen merged commit 92ae21d into stable20 Oct 6, 2020
@delete-merged-branch delete-merged-branch bot deleted the backport/240/stable20 branch October 6, 2020 14:32
@ghost ghost mentioned this pull request Oct 11, 2020
@MorrisJobke MorrisJobke mentioned this pull request Oct 15, 2020
5 tasks
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.

3 participants