Merge branch '2019.2' into merge-develop

Conflicts: Pipfile doc/topics/releases/2019.2.0.rst requirements/pytest.txt salt/modules/cmdmod.py salt/modules/nxos.py salt/modules/virt.py salt/modules/win_lgpo.py salt/states/cmd.py salt/states/virt.py salt/utils/network.py tests/unit/utils/test_network.py
saltstack · Jan 22, 2019 · c3c388b · c3c388b
2 parents dc4df1f + 6dd8e40
commit c3c388b
Show file tree

Hide file tree

Showing 64 changed files with 210,254 additions and 170,697 deletions.
diff --git a/Pipfile b/Pipfile
@@ -21,7 +21,8 @@ boto3 = ">=1.2.1"
 moto = ">=0.3.6"
 SaltPyLint = ">=v2017.3.6"
 pytest = ">=4.0.1"
-pytest-salt = ">=2018.12.7"
+pytest-cov = "*"
+pytest-salt = "==2018.12.8"
 pytest-timeout = ">=1.3.3"
 pytest-tempdir = ">=2018.8.11"
 pytest-helpers-namespace = ">=2017.11.11"

diff --git a/doc/man/salt-api.1 b/doc/man/salt-api.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SALT-API" "1" "Sep 21, 2018" "2018.3.3" "Salt"
+.TH "SALT-API" "1" "Jan 08, 2019" "2019.2.0" "Salt"
 .SH NAME
 salt-api \- salt-api Command
 .

diff --git a/doc/man/salt-call.1 b/doc/man/salt-call.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SALT-CALL" "1" "Sep 21, 2018" "2018.3.3" "Salt"
+.TH "SALT-CALL" "1" "Jan 08, 2019" "2019.2.0" "Salt"
 .SH NAME
 salt-call \- salt-call Documentation
 .

diff --git a/doc/man/salt-cloud.1 b/doc/man/salt-cloud.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SALT-CLOUD" "1" "Sep 21, 2018" "2018.3.3" "Salt"
+.TH "SALT-CLOUD" "1" "Jan 08, 2019" "2019.2.0" "Salt"
 .SH NAME
 salt-cloud \- Salt Cloud Command
 .

diff --git a/doc/man/salt-cp.1 b/doc/man/salt-cp.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SALT-CP" "1" "Sep 21, 2018" "2018.3.3" "Salt"
+.TH "SALT-CP" "1" "Jan 08, 2019" "2019.2.0" "Salt"
 .SH NAME
 salt-cp \- salt-cp Documentation
 .

diff --git a/doc/man/salt-key.1 b/doc/man/salt-key.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SALT-KEY" "1" "Sep 21, 2018" "2018.3.3" "Salt"
+.TH "SALT-KEY" "1" "Jan 08, 2019" "2019.2.0" "Salt"
 .SH NAME
 salt-key \- salt-key Documentation
 .

diff --git a/doc/man/salt-master.1 b/doc/man/salt-master.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SALT-MASTER" "1" "Sep 21, 2018" "2018.3.3" "Salt"
+.TH "SALT-MASTER" "1" "Jan 08, 2019" "2019.2.0" "Salt"
 .SH NAME
 salt-master \- salt-master Documentation
 .

diff --git a/doc/man/salt-minion.1 b/doc/man/salt-minion.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SALT-MINION" "1" "Sep 21, 2018" "2018.3.3" "Salt"
+.TH "SALT-MINION" "1" "Jan 08, 2019" "2019.2.0" "Salt"
 .SH NAME
 salt-minion \- salt-minion Documentation
 .

diff --git a/doc/man/salt-proxy.1 b/doc/man/salt-proxy.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SALT-PROXY" "1" "Sep 21, 2018" "2018.3.3" "Salt"
+.TH "SALT-PROXY" "1" "Jan 08, 2019" "2019.2.0" "Salt"
 .SH NAME
 salt-proxy \- salt-proxy Documentation
 .