valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
81,490 Commits 24 Branches 182 Tags 341 MiB
7091a0b4aa
Commit Graph

81490 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Wallace
7091a0b4aa specify when to run venafi tests 2017-05-25 10:27:40 -06:00
Daniel Wallace
e5f5514ec6 add venafi test 2017-05-25 10:26:54 -06:00
Daniel Wallace
1b517de988 pass password to unlock key 2017-05-25 10:26:54 -06:00
Daniel Wallace
436a5a61ff use password in gen_csr if provided 2017-05-25 10:26:54 -06:00
Daniel Wallace
343a0b206c fix doc 2017-05-25 10:26:54 -06:00
wgoulet
44dec966c8 Updated documentation for Venafi module with better examples & clarifications 2017-05-25 10:26:54 -06:00
Daniel Wallace
b0f9e57821 change default venafi api endpoint 2017-05-25 10:26:54 -06:00
Daniel Wallace
8cfb8fce76 use utils for http.query 2017-05-25 10:26:54 -06:00
Daniel Wallace
13b3680180 fix venafi typo 2017-05-25 10:26:54 -06:00
Nicole Thomas
f2a9039de2 Merge pull request #41427 from terminalmage/py3-tests 
Skip a test that doesn't apply to Python 3
 2017-05-25 09:51:51 -06:00
Erik Johnson
28a8605dea Skip a test that doesn't apply to Python 3 
This test is checking behavior that seems to have been specific to the
carbon package from PyPI. Since this is a Python 2-only module, and has
deps that do not exist on Python 3, it should not be run on Python 3.
 2017-05-25 09:37:35 -05:00
Nicole Thomas
460af48f1f Merge pull request #41390 from rallytime/merge-nitrogen 
[nitrogen] Merge forward from 2016.11 to nitrogen
 2017-05-24 15:27:22 -06:00
Mike Place
78078cb62d Merge pull request #41382 from DSRCorporation/bugs/py3_tests_nitrogen 
Bugs/py3 tests nitrogen
 2017-05-24 14:06:38 -05:00
rallytime
537fd763dc Rename proxy test files to use test_* syntax 2017-05-24 13:03:21 -06:00
Mike Place
d7e2d2fe02 Merge pull request #41351 from jmarinaro/fix-chocolatey-package-collision-nitrogen 
Fix package name collisions in chocolatey state
 2017-05-24 12:48:33 -05:00
Mike Place
0ff7049487 Merge pull request #41392 from rallytime/bp-40829 
Back-port #40829 to nitrogen
 2017-05-24 11:35:31 -05:00
rallytime
098ed60d1b Rework proxy minion test files to use new import styles 2017-05-24 10:23:57 -06:00
rallytime
56ad5629f6 Disable pylint warnings for uses of "open" in proxy minion dummy file 
There is an associated "close" for both of the open instances.
 2017-05-24 09:55:35 -06:00
rallytime
5b27c2daf8 Comment out/remove proxy pieces from integration tests file 
This was left over from a merge-forward. The proxy minion testing
pieces could not be completely merged-forward due to large conflicts
in this file. Please see the comment in PR #41113 for more information.
 2017-05-24 09:51:00 -06:00
rallytime
7d390aad6f Pylint fix for config/__init__.py proxy settings 2017-05-23 16:42:51 -06:00
Ch3LL
858adcf3df fix where clone check happens 2017-05-23 11:35:20 -06:00
Ch3LL
0d3f5da0ec add spaces for code in docs 2017-05-23 11:35:20 -06:00
Ch3LL
42e614bb7d add title 2017-05-23 11:35:20 -06:00
Ch3LL
b02ec97cff add ability to expand disk size on creation of vm in nebula 2017-05-23 11:35:20 -06:00
rallytime
616ac7289b Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - salt/config/__init__.py
  - salt/modules/elasticsearch.py
  - tests/integration/__init__.py
 2017-05-23 10:36:41 -06:00
Dmitry Kuzmenko
3cd0f5ebcf Check master shut down correctly. 2017-05-23 11:53:56 +03:00
Dmitry Kuzmenko
4ed0f8ed4e Fixed grains module test: Arch release is 'rolling', not an empty str. 2017-05-23 11:53:56 +03:00
Dmitry Kuzmenko
583e3b9a5a Update pip version in pip upgrade test by compatibility reason. 
6.0 version doesn't work in a modern environment.
 2017-05-23 11:53:56 +03:00
Dmitry Kuzmenko
d80fa95f10 Add venv version of test_pip_installed_removed to work as non-root. 2017-05-23 11:53:56 +03:00
Dmitry Kuzmenko
9f31428129 Update ACL module test to work as non-root. 2017-05-23 11:53:56 +03:00
Mike Place
1ba95684a9 Merge pull request #41113 from cro/proxy_auto_test2 
Rescue proxy_auto_tests PR from git rebase hell
 2017-05-22 12:05:07 -05:00
Mike Place
337d00fbf9 Merge pull request #41352 from whiteinge/rest_cherrypy-cors-token 
rest_cherrypy CORS fix & /token endpoint
 2017-05-22 11:03:04 -05:00
Mike Place
8b45b577a9 Merge pull request #41356 from whiteinge/doc-full_return 
Add full_return to release notes
 2017-05-22 10:56:14 -05:00
Mike Place
8f632108d8 Merge pull request #41358 from rallytime/merge-nitrogen 
[nitrogen] Merge forward from 2016.11 to nitrogen
 2017-05-22 10:55:15 -05:00
Mike Place
375892d910 Merge pull request #41360 from cro/sysrc_fix 
Sysrc on FreeBSD, YAML overeager to coerce to bool and int
 2017-05-22 10:54:31 -05:00
Mike Place
01b71c75c1 Merge pull request #41372 from terminalmage/issue41190 
Don't use intermediate file when listing contents of tar.xz file
 2017-05-22 10:36:44 -05:00
Mike Place
5edfcf972c Merge pull request #41373 from alex-zel/patch-3 
Allow HTTP authentication to ES.
 2017-05-22 10:32:09 -05:00
Erik Johnson
1f08936d9c Remove unused import 2017-05-22 02:18:28 -05:00
Erik Johnson
68cb897520 Replace reference to fileobj 
This was an argument I had initially added to _list_tar() but later
removed in favor of an isinstance check. Since this was removed, this
argument no longer exists.
 2017-05-22 02:13:56 -05:00
Alex Zel
3192eab128 Allow HTTP authentication to ES. 
Add option to authenticate to Elasticsearch instance with optional SSL.
 2017-05-22 09:09:37 +03:00
Erik Johnson
788874408a Remove '*' from mode 
This is unnecessary, as the data being piped in is uncompressed.
 2017-05-21 23:50:36 -05:00
Erik Johnson
3d4b833627 Don't use intermediate file when listing contents of tar.xz file 
This instead pipes the decompressed tar data directly to tarfile.open()
 2017-05-21 23:37:51 -05:00
Seth House
fa0b1e7d7e Add full_return to release notes 2017-05-21 16:27:40 -06:00
rallytime
bf6aa813c5 Pylint fix 2017-05-21 10:52:22 -06:00
C. R. Oldham
6db31ce52a Fix problem with sysrc on FreeBSD, YAML overeager to coerce to bool and int. 
Fix problem with sysrc on FreeBSD, YAML overeager to coerce to bool
 2017-05-20 19:39:22 -06:00
rallytime
c6c1d30c48 Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - salt/modules/yumpkg.py
  - salt/spm/__init__.py
  - tests/unit/modules/test_zypper.py
  - tests/unit/utils/test_network.py
 2017-05-20 17:07:34 -06:00
Seth House
f6ae3b4634 Add rest_cherrypy additions to the release notes 2017-05-20 15:59:46 -06:00
Seth House
031e703209 Lint fix 
Not really a fan of this rule...
 2017-05-20 13:29:11 -06:00
Seth House
1658429b56 Update reference JavaScript app 
Don't use cookies for auth. Better app structure that doesn't rely on
eventsource hacks to show login page and other improvements.
 2017-05-19 21:28:06 -06:00
Seth House
bec3da3a2f Add /token convenience endpoint 2017-05-19 21:28:05 -06:00