Skip to content

Commit

Permalink
Merge pull request #583 from yandex/release
Browse files Browse the repository at this point in the history
Release 1.9.13
  • Loading branch information
fomars committed May 3, 2018
2 parents 24e7331 + 7261191 commit 61fec33
Show file tree
Hide file tree
Showing 43 changed files with 538 additions and 361 deletions.
9 changes: 9 additions & 0 deletions Dockerfile-test
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
FROM ubuntu:16.04
WORKDIR /yandextank
RUN apt-get update && \
apt-get install -y python-pip
RUN pip install --upgrade setuptools
RUN pip install --upgrade pip
RUN pip install pytest
CMD pip install . && pytest -s
# docker run -v /path/to/yandextank:/yandextank --name my_container my_image
1 change: 1 addition & 0 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
telnet \
atop \
openssh-client \
git \
python-pip && \
add-apt-repository ppa:yandex-load/main -y && \
apt-get update -q && \
Expand Down
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
# The short X.Y version.
version = '1.9'
# The full version, including alpha/beta/rc tags.
release = '1.9.10'
release = '1.9.11'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
14 changes: 6 additions & 8 deletions docs/config_reference.rst
Original file line number Diff line number Diff line change
Expand Up @@ -392,12 +392,10 @@ DataUploader

``upload_token`` (string)
-------------------------
*\- Job's token. Use to upload data to an existing job. Requres jobno. Default:* ``None``
*\- Job's token. Use to upload data to an existing job. Requres jobno.*

:dependencies:
jobno
:nullable:
True

``ver`` (string)
----------------
Expand Down Expand Up @@ -540,19 +538,19 @@ Pandora

``config_content`` (dict)
-------------------------
*\- (no description). Default:* ``{}``
*\- Pandora config contents. Default:* ``{}``

``config_file`` (string)
------------------------
*\- (no description). Default:* ``""``
*\- Pandora config file path. Default:* ``""``

``expvar`` (boolean)
--------------------
*\- (no description). Default:* ``True``
*\- Toggle expvar monitoring. Default:* ``True``

``pandora_cmd`` (string)
------------------------
*\- (no description). Default:* ``pandora``
*\- Pandora executable path. Default:* ``pandora``

Phantom
=======
Expand Down Expand Up @@ -807,7 +805,7 @@ Phantom

``use_caching`` (boolean)
-------------------------
*\- Enable stpd\-file caching. Default:* ``True``
*\- Enable stpd\-file caching for similar tests. Set false to reload ammo file and generate new stpd. Default:* ``True``

``writelog`` (string)
---------------------
Expand Down

0 comments on commit 61fec33

Please sign in to comment.