diff options
| author | Milo Casagrande <milo.casagrande@linaro.org> | 2015-02-02 10:29:50 +0100 |
|---|---|---|
| committer | Milo Casagrande <milo.casagrande@linaro.org> | 2015-02-02 10:29:50 +0100 |
| commit | d4d79b635b47b7336a38ffd1f0039a6d3d510d7f (patch) | |
| tree | 662aa5243ed2c8d981140734a483fc3ced15f342 | |
| parent | 11568221224bb8d5f46eb45d681d0e51317f1ae3 (diff) | |
| parent | 1c7bbe5ab8d09a2141fb748fe2297c6a681aab5a (diff) | |
Merge branch 'master' into mainline-bisect
Conflicts:
app/taskqueue/celeryconfig.py
app/taskqueue/tasks.py
Change-Id: Id77a388ca5ea6dfd82efa6f9dff1d2a1672d4e38
| -rw-r--r-- | ansible/roles/init-conf/templates/kernelci-celery-beat.service | 2 | ||||
| -rw-r--r-- | app/handlers/__init__.py | 2 | ||||
| -rw-r--r-- | doc/examples.rst | 7 |
3 files changed, 4 insertions, 7 deletions
diff --git a/ansible/roles/init-conf/templates/kernelci-celery-beat.service b/ansible/roles/init-conf/templates/kernelci-celery-beat.service index a0d5add..270a68f 100644 --- a/ansible/roles/init-conf/templates/kernelci-celery-beat.service +++ b/ansible/roles/init-conf/templates/kernelci-celery-beat.service @@ -16,7 +16,7 @@ PIDFile=/tmp/kernelci-celery-beat.pid WorkingDirectory={{ install_base }}/{{ hostname }}/app ExecStart={{ install_base }}/.venv/{{ hostname }}/bin/python -OO -R \ {{ install_base }}/.venv/{{ hostname }}/bin/celery beat \ - --loglevel=INFO --schedule=/var/run/celery/kernelci-beat.db + --loglevel=INFO --schedule=/var/run/celery/kernelci-beat.db \ --app=taskqueue [Install] diff --git a/app/handlers/__init__.py b/app/handlers/__init__.py index d4302cd..56b268e 100644 --- a/app/handlers/__init__.py +++ b/app/handlers/__init__.py @@ -1,2 +1,2 @@ -__version__ = "2015.1.3" +__version__ = "2015.1.4" __versionfull__ = __version__ diff --git a/doc/examples.rst b/doc/examples.rst index 8d18d25..bdd3bbf 100644 --- a/doc/examples.rst +++ b/doc/examples.rst @@ -449,12 +449,9 @@ Upload a single file 'Authorization': AUTHORIZATION_TOKEN } - files = { - 'file': (open('/path/to/boot-arch.json', 'rb')) - } - url = urljoin(BACKEND_URL, '/upload/next/next-20150116/arm64-allnoconfig/lab-name/boot-arch.json') - response = requests.put(url, headers=headers, files=files) + with open('/path/to/boot-arch.json', 'rb') as upload_file: + response = requests.put(url, headers=headers, data=upload_file) print response.content |