On Tue, Oct 29, 2013 at 04:46:16PM -0400, Dwight Engen wrote:
> Commit 1ea59ad28 sets memory.use_hierarchy, which means that this test
> cannot use memory.swappiness as its dummy cgroup item to set/unset since
> writing to it with use_hierarchy set gets -EINVAL. Change test to use
> memory.soft_lim
Branch: refs/heads/master
Home: https://github.com/lxc/lxc
Commit: 1f845c396fc102951cc250d75f6f2bbfcb321aa0
https://github.com/lxc/lxc/commit/1f845c396fc102951cc250d75f6f2bbfcb321aa0
Author: Dwight Engen
Date: 2013-10-30 (Wed, 30 Oct 2013)
Changed paths:
M src/tests/cgpa
On Tue, Oct 29, 2013 at 04:46:21PM -0400, Dwight Engen wrote:
> Signed-off-by: Dwight Engen
Acked-by: Stéphane Graber
> ---
> src/lxc/cgroup.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/src/lxc/cgroup.c b/src/lxc/cgroup.c
> index 6aa4495..01ed040 100644
> --- a/s
Quoting Sheng Yong (shy...@gmail.com):
> If lxc.rootfs is specified, we believe rootfs is ready. lxc-start will
> check this later. Return true, because the container is created.
>
> Signed-off-by: Sheng Yong
Ok - I'm going to apply these two unchanged for the sake of attribution,
then push some
Branch: refs/heads/master
Home: https://github.com/lxc/lxc
Commit: a69aad27ad5a217a4f58f525fb34f764390dd474
https://github.com/lxc/lxc/commit/a69aad27ad5a217a4f58f525fb34f764390dd474
Author: Sheng Yong
Date: 2013-10-30 (Wed, 30 Oct 2013)
Changed paths:
M src/lxc/lxcconta
Branch: refs/heads/master
Home: https://github.com/lxc/lxc
Commit: 0590e82c10ea3b75f0c4d462de3f5bb344da37c5
https://github.com/lxc/lxc/commit/0590e82c10ea3b75f0c4d462de3f5bb344da37c5
Author: Serge Hallyn
Date: 2013-10-30 (Wed, 30 Oct 2013)
Changed paths:
M src/lxc/lxccon
I goofed and left in a getchar() that I was using to pause the test program
in a case that was failing for me. Remove it.
Signed-off-by: Dwight Engen
---
src/tests/cgpath.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/tests/cgpath.c b/src/tests/cgpath.c
index 13986cf..acf3c2d 100644
--
c->lxc_conf cannot be NULL in this case since the call sequence
c->save_config()
c->load_config()
load_config_locked()
which is done before this check will allocate it or fail
Signed-off-by: Dwight Engen
---
src/lxc/lxccontainer.c | 34 --
1 file changed, 16
Reported-by: Fatih Arslan
Signed-off-by: S.Çağlar Onur
---
src/lxc/lxc_start.c| 2 +-
src/lxc/lxccontainer.c | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/lxc/lxc_start.c b/src/lxc/lxc_start.c
index 2e3c3b3..add2542 100644
--- a/src/lxc/lxc_start.c
+++ b/src/lxc/l
Branch: refs/heads/master
Home: https://github.com/lxc/lxc
Commit: 83758ed00f731b11abed774097112db61b7131bf
https://github.com/lxc/lxc/commit/83758ed00f731b11abed774097112db61b7131bf
Author: S.Çağlar Onur
Date: 2013-10-30 (Wed, 30 Oct 2013)
Changed paths:
M src/lxc/lxc_s
Quoting S.Çağlar Onur (cag...@10ur.org):
> Reported-by: Fatih Arslan
> Signed-off-by: S.Çağlar Onur
Acked-by: Serge E. Hallyn
> ---
> src/lxc/lxc_start.c| 2 +-
> src/lxc/lxccontainer.c | 2 ++
> 2 files changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/src/lxc/lxc_start.c b/src/l
Quoting Dwight Engen (dwight.en...@oracle.com):
> c->lxc_conf cannot be NULL in this case since the call sequence
> c->save_config()
> c->load_config()
> load_config_locked()
> which is done before this check will allocate it or fail
>
> Signed-off-by: Dwight Engen
Sorry, already done.
--
Quoting Dwight Engen (dwight.en...@oracle.com):
> I goofed and left in a getchar() that I was using to pause the test program
> in a case that was failing for me. Remove it.
>
> Signed-off-by: Dwight Engen
hah - i did see the warning and was wondering :) thanks.
Acked-by: Serge E. Hallyn
> -
Branch: refs/heads/master
Home: https://github.com/lxc/lxc
Commit: f25f058d5d9da06305fdb3f4af6f48dcddd56467
https://github.com/lxc/lxc/commit/f25f058d5d9da06305fdb3f4af6f48dcddd56467
Author: Dwight Engen
Date: 2013-10-30 (Wed, 30 Oct 2013)
Changed paths:
M src/tests/cgpa
Conflict occurs between following lines
[...]
269 if (values[i])
270 return values[i];
[...]
and
[...]
309 /* could not find value, use default */
310 values[i] = (*ptr)[1];
[...]
so call it while holding the process_lock
Signed-off-by: S.Çağlar Onur
--
15 matches
Mail list logo