MAAS

Merge lp:~ltrager/maas/lp1673791 into lp:~maas-committers/maas/trunk

  1. lp1673791
  2. Merge into trunk
Proposed by Lee Trager
Status: Merged
Approved by: Lee Trager
Approved revision: no longer in the source branch.
Merged at revision: 5846
Proposed branch: lp:~ltrager/maas/lp1673791
Merge into: lp:~maas-committers/maas/trunk
Diff against target: 9 lines (+1/-1)
1 file modified
src/metadataserver/builtin_scripts/stress_ng_memory_long.sh (+1/-1)
To merge this branch: bzr merge lp:~ltrager/maas/lp1673791
Reviewer Review Type Date Requested Status
Andres Rodriguez (community) Approve
Review via email: mp+320593@code.launchpad.net

Commit message

A typo in the stress_ng_memory_long test caused it to run without limit.

This also adds a license to stress_ng_cpu_long.sh, removes the internet tag from the ntp as normally the ntp server configured is the rack controller, and builtin scripts are now added or updated with a comment with the version used.

To post a comment you must log in.
Revision history for this message
Andres Rodriguez (andreserl) wrote :

First and foremost. This branch includes many changes that not only address the bug, but include other things. Questions inline.

review: Needs Information
Revision history for this message
Andres Rodriguez (andreserl) wrote :

Also, please *separate* thge bug fix from this branch. Adding stuff that's not related to a bug fix really delays things.

Revision history for this message
Lee Trager (ltrager) wrote :

Updated to only contain the fix.

Revision history for this message
Andres Rodriguez (andreserl) wrote :

lgtm!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/metadataserver/builtin_scripts/stress_ng_memory_long.sh'
2--- src/metadataserver/builtin_scripts/stress_ng_memory_long.sh 2017-03-10 16:34:33 +0000
3+++ src/metadataserver/builtin_scripts/stress_ng_memory_long.sh 2017-03-22 21:30:34 +0000
4@@ -23,4 +23,4 @@
5
6 sudo stress-ng \
7 --aggressive -a 0 --class memory --ignite-cpu --log-brief --metrics \
8- --times --tz --verify --time 12h
9+ --times --tz --verify --timeout 12h