Merge pull request #551 from fomars/develop

docs update
yandex · Apr 4, 2018 · f4b081c · f4b081c
2 parents 0c5af69 + a0d8545
commit f4b081c
Show file tree

Hide file tree

Showing 4 changed files with 122 additions and 120 deletions.
diff --git a/docs/conf.py b/docs/conf.py
@@ -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.

diff --git a/docs/config_reference.rst b/docs/config_reference.rst
@@ -366,10 +366,6 @@ DataUploader
 :nullable:
  True
 
-``regress`` (boolean)
----------------------
-*\- mark test as regression. Default:* ``False``
-
 ``send_status_period`` (integer)
 --------------------------------
 *\- delay between status notifications. Default:* ``10``
@@ -453,6 +449,13 @@ Influx
 JMeter
 ======
 
+``affinity`` (string)
+---------------------
+*\- Use to set CPU affinity. Default:* ``""``
+
+:nullable:
+ True
+
 ``args`` (string)
 -----------------
 *\- additional commandline arguments for JMeter. Default:* ``""``
@@ -524,25 +527,32 @@ JsonReport
 Pandora
 =======
 
+``affinity`` (string)
+---------------------
+*\- Use to set CPU affinity. Default:* ``""``
+
+:nullable:
+ True
+
 ``buffered_seconds`` (integer)
 ------------------------------
 *\- (no description). Default:* ``2``
 
 ``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
 =======