diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-04-26 09:59:34 -0400 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-04-26 09:59:34 -0400 |
| commit | 5bfa5b7eee551c14ecee616f1830dc4603497311 (patch) | |
| tree | 53917036e3a7b515c6c794aa7d1c127d61c15508 /main/fixtures | |
| parent | 9d3cb6e783603d4991f7e610912ba5665fd43260 (diff) | |
| parent | 55b776d58999412cd6bf0787a41d6ab00bf80fb6 (diff) | |
Merge branch 'archweb-generic2'
Conflicts:
main/fixtures/arches.json
settings.py
templates/public/index.html
templates/public/svn.html
Diffstat (limited to 'main/fixtures')
| -rw-r--r-- | main/fixtures/arches.json | 81 |
1 files changed, 42 insertions, 39 deletions
diff --git a/main/fixtures/arches.json b/main/fixtures/arches.json index f7e7fdc0..6ebd0c15 100644 --- a/main/fixtures/arches.json +++ b/main/fixtures/arches.json @@ -1,42 +1,45 @@ [ - { - "pk": 1, - "model": "main.arch", - "fields": { - "agnostic": true, - "name": "any" - } - }, - { - "pk": 2, - "model": "main.arch", - "fields": { - "agnostic": false, - "name": "i686" - } - }, - { - "pk": 3, - "model": "main.arch", - "fields": { - "agnostic": false, - "name": "x86_64" - } - }, - { - "pk": 4, - "model": "main.arch", - "fields": { - "agnostic": false, - "name": "mips64el" - } - }, - { - "pk": 5, - "model": "main.arch", - "fields": { - "agnostic": false, - "name": "i586" - } +{ + "pk": 1, + "model": "main.arch", + "fields": { + "agnostic": true, + "name": "any", + "required_signoffs": 2 } +}, +{ + "pk": 2, + "model": "main.arch", + "fields": { + "agnostic": false, + "name": "i686", + "required_signoffs": 1 + } +}, +{ + "pk": 3, + "model": "main.arch", + "fields": { + "agnostic": false, + "name": "x86_64", + "required_signoffs": 2 + } +}, +{ + "pk": 4, + "model": "main.arch", + "fields": { + "agnostic": false, + "name": "mips64el" + } +}, +{ + "pk": 5, + "model": "main.arch", + "fields": { + "agnostic": false, + "name": "i586" + } +} ] |