Skip to content

[20] Fix Memory (#240) - #245

Merged
nickvergessen merged 1 commit into
stable20from
backport/240/stable20
Oct 6, 2020
Merged

[20] Fix Memory (#240)#245
nickvergessen merged 1 commit into
stable20from
backport/240/stable20

Conversation

@kesselb

Copy link
Copy Markdown
Collaborator

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 <matthew@wener.org>
Signed-off-by: Matthew Wener <mwener115@gmail.com>
* Prevent float in swapinfo and update tests for hw.realmem
Signed-off-by: Matthew Wener <matthew@wener.org>
Signed-off-by: Matthew Wener <mwener115@gmail.com>
* Update testGetMemoryNoSwapinfo to hw.realmem
Signed-off-by: Matthew Wener <mwener115@gmail.com>
(cherry picked from commit 49952d2)
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
@kesselb
kesselbforce-pushed the backport/240/stable20 branch from dffae94 to b8bfc26CompareOctober 4, 2020 10:49
@kesselbkesselb added this to the Nextcloud 20.0.1 milestone Oct 4, 2020
@kesselbkesselb changed the title Fix Memory (#240)[20] Fix Memory (#240)Oct 4, 2020
@nickvergessen
nickvergessen merged commit 92ae21d into stable20Oct 6, 2020
@delete-merged-branch
delete-merged-branchBot deleted the backport/240/stable20 branch October 6, 2020 14:32
@ghostghost mentioned this pull request Oct 11, 2020
@MorrisJobkeMorrisJobke mentioned this pull request Oct 15, 2020
5 tasks
Sign up for freeto 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.

2 participants

@kesselb@nickvergessen