[lxc-devel] [lxc/lxc] 294883: Fix swap calculation

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/lxc/lxc
  Commit: 294883150ce100a8b54047e5e53d1c9671f28912
      https://github.com/lxc/lxc/commit/294883150ce100a8b54047e5e53d1c9671f28912
  Author: Eva Charlotte Mayer <eva-charlotte.mayer at posteo.de>
  Date:   2015-12-23 (Wed, 23 Dec 2015)

  Changed paths:
    M src/lxc/lxc-ls.in

  Log Message:
  -----------
  Fix swap calculation

Signed-off-by: Eva Charlotte Mayer <eva-charlotte.mayer at posteo.de>


  Commit: 364d54c9f09a770cbaf432cda295923720c74c31
      https://github.com/lxc/lxc/commit/364d54c9f09a770cbaf432cda295923720c74c31
  Author: Serge Hallyn <serge at hallyn.com>
  Date:   2015-12-23 (Wed, 23 Dec 2015)

  Changed paths:
    M src/lxc/lxc-ls.in

  Log Message:
  -----------
  Merge pull request #738 from ec-m/ec-m_lxc-ls

Fix swap calculation (#737)


Compare: https://github.com/lxc/lxc/compare/99d78dcc972c...364d54c9f09a