valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
95,621 Commits 24 Branches 182 Tags 341 MiB
ebc9a01b38
Commit Graph

1020 Commits

Author SHA1 Message Date
rallytime
91534ee04a
Merge branch '2017.7' into '2018.3' 
No conflicts.
 2018-10-08 16:16:45 -04:00
twangboy
a66765fc4c
Remove arrInstalled artifact 2018-10-04 09:49:12 -06:00
rallytime
b628ad729b
Merge branch '2018.3.3' into '2018.3' 
Conflicts:
  - tests/integration/states/test_file.py
 2018-09-12 12:35:00 -04:00
rallytime
19598d8802
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - pkg/osx/build_env.sh
  - salt/cloud/clouds/proxmox.py
  - salt/minion.py
  - salt/modules/win_lgpo.py
  - salt/netapi/rest_tornado/__init__.py
  - salt/netapi/rest_tornado/saltnado.py
  - salt/returners/local_cache.py
  - salt/returners/rawfile_json.py
  - salt/utils/minions.py
 2018-09-11 12:51:52 -04:00
rallytime
09247a33a2
Merge branch '2017.7.8' into '2017.7' 
No conflicts.
 2018-09-10 12:53:13 -04:00
twangboy
6105ebbebb
Use setup.py clean --all 2018-09-07 17:29:33 -06:00
twangboy
fe02b2276f
Add 1.0.2p shasum file 2018-09-06 10:08:46 -06:00
twangboy
5f06dc2762
Fix issues with osx build scripts on 2018.3.3 
Upgrade openssl to 1.0.2p
 2018-09-06 10:05:58 -06:00
twangboy
750d3fa29e
Remove trusted host switches 2018-09-06 09:59:46 -06:00
twangboy
6b42e73ee9
Fix issues with build script on OSX 
Upgrade openSSL to 1.0.2p
Upgrade six to 1.11
 2018-09-06 09:37:24 -06:00
rallytime
edad2dcda9
Merge branch '2017.7.8' into '2017.7' 
No conflicts.
 2018-09-05 09:36:33 -04:00
twangboy
fb97b00130
Fix broken path to libsodium tarball 2018-08-29 16:40:56 -06:00
twangboy
68fd37575e
Fix erroneous NSSM reference 2018-08-23 17:28:56 -06:00
twangboy
103f2c289e
Remove delete vcredist line 2018-08-23 17:24:38 -06:00
twangboy
007a16638e
Bring installer updates from 2017.7.8 to 2018.3.3 2018-08-23 17:13:53 -06:00
twangboy
a112eaa597
Fix path to libsodium tarball 2018-08-23 10:15:28 -06:00
twangboy
a8f054b2d2
Add 64bit binaries for KB2999226 to the x86 installer 
Fix logic where it detects the Architecture of the system running the
installer instead of the one building the installer
Add a 3 seconds pause to actually see the error code if it throws one
 2018-08-22 22:34:50 -06:00
twangboy
e8a1d2f772
Add more descriptive error when KB not found 2018-08-20 17:04:10 -06:00
twangboy
71737ea687
Suppress all ui on vcredist installation 2018-08-20 16:48:39 -06:00
twangboy
7dae9bb2a1
Fix Windows and OSX installers 
Adds support to Universal Runtime Libraries (UCRT) for Windows
Adds futures to the req.txt for OSX
 2018-08-20 16:11:34 -06:00
Daniel A Wozniak
05a2b91fb2
Install the launcher so we can execute py files 2018-08-17 11:25:32 -04:00
twangboy
1227095c5d
Add nonfatal switch to VCRedist 2018-08-14 10:21:18 -06:00
Daniel A Wozniak
566a4ea66a
Install the launcher so we can execute py files 2018-08-13 16:21:59 -07:00
rallytime
e740d3b208
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - salt/client/ssh/state.py
  - salt/client/ssh/wrapper/state.py
  - salt/modules/dockermod.py
  - salt/modules/npm.py
  - salt/modules/testinframod.py
  - tests/integration/modules/test_mac_system.py
  - tests/integration/modules/test_mac_timezone.py
  - tests/integration/ssh/test_state.py
  - tests/integration/states/test_user.py
  - tests/unit/modules/test_npm.py
  - tests/unit/states/test_file.py
 2018-07-23 11:15:43 -04:00
twangboy
e30d17099d
Use goto instead of if statement 2018-07-17 18:23:34 -06:00
twangboy
e1042fa084
Remove vcredist for Py3 2018-07-17 16:28:01 -06:00
rallytime
29b05ffdd1
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - doc/man/salt-api.1
  - doc/man/salt-call.1
  - doc/man/salt-cloud.1
  - doc/man/salt-cp.1
  - doc/man/salt-key.1
  - doc/man/salt-master.1
  - doc/man/salt-minion.1
  - doc/man/salt-proxy.1
  - doc/man/salt-run.1
  - doc/man/salt-ssh.1
  - doc/man/salt-syndic.1
  - doc/man/salt-unity.1
  - doc/man/salt.1
  - doc/man/salt.7
  - doc/man/spm.1
  - pkg/windows/req.txt
  - tests/integration/runners/test_state.py
  - tests/integration/states/test_file.py
  - tests/integration/states/test_npm.py
 2018-07-11 14:49:27 -04:00
twangboy
361b3cdc2f
Rollback python-certifi-win32 
It's causing issues with the test suite on Windows
 2018-07-11 10:33:39 -06:00
rallytime
68aabff0cf
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - pkg/windows/req.txt
  - salt/netapi/rest_tornado/saltnado.py
  - salt/utils/versions.py
  - tests/integration/states/test_file.py
 2018-07-09 10:27:58 -04:00
twangboy
b0087d425c
Add license info 2018-07-06 15:55:14 -06:00
twangboy
935f9b560c
Fix dependencies 
Adds back libnacl
Adds back libsodium.dll
Adds new python-certifi-win32
 2018-07-06 15:46:57 -06:00
Daniel Wallace
9f0bd90c5b
Merge pull request #48034 from vinian/restart-salt-syndic-when-salt-master-retart 
restart salt-syndic when salt-master restart
 2018-06-21 15:12:36 -05:00
twangboy
59ae2cc5fc
Use --disable-pip-version-check for build_env_#.ps1 2018-06-18 13:15:03 -06:00
twangboy
5c00fce6bf
Use the --disable-pip-version-check option 2018-06-18 19:06:10 +00:00
vinian
f7652d8c8b restart salt-syndic when salt-master restart 
Fixes: #48029
 2018-06-08 22:13:51 +08:00
Pablo Suárez Hernández
efe308013a
Align SUSE salt-master.service 'LimitNOFILES' limit with upstream Salt 2018-05-31 11:02:18 +01:00
rallytime
dc32b67c03
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - salt/modules/win_snmp.py
  - tests/integration/modules/test_saltutil.py
  - tests/integration/states/test_pkg.py
  - tests/support/helpers.py
  - tests/support/runtests.py
  - tests/unit/fileserver/test_gitfs.py
  - tests/whitelist.txt
 2018-05-29 11:14:39 -04:00
twangboy
66d8b0331a
Add sign.bat script for signing packages 2018-05-23 11:20:51 -06:00
Nicole Thomas
21809ddc02
Merge pull request #47514 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-05-08 14:36:53 -04:00
rallytime
786076ac03
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - pkg/windows/modules/get-settings.psm1
  - salt/modules/cmdmod.py
  - salt/modules/pip.py
  - salt/modules/win_lgpo.py
  - salt/states/pip_state.py
  - tests/integration/states/test_pip.py
  - tests/support/helpers.py
  - tests/unit/modules/test_pip.py
  - tests/whitelist.txt
 2018-05-07 13:17:01 -04:00
Daniel A. Wozniak
3557fc5fa6
Fix crufty nssm.exe reference 2018-05-05 22:32:05 -07:00
twangboy
9d498293b1
Remove unused settings, update NSIS 2018-05-03 16:46:03 -06:00
twangboy
5549d83aae
Use ssm instead of nssm 2018-04-25 23:14:28 +00:00
rallytime
4718d31e53
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - salt/config/__init__.py
  - salt/minion.py
  - salt/modules/pip.py
  - salt/states/pip_state.py
  - salt/states/virtualenv_mod.py
  - tests/integration/modules/test_status.py
 2018-04-19 17:15:20 -04:00
twangboy
990a24d7ed
Fix build_env scripts 
Uses `cmd /c` when launching commands to avoid the hang when installing
python 3
`clean_env.bat` will uninstall Py2 and Py3 in a single run
 2018-04-12 11:26:40 -06:00
rallytime
2f1cf3e511
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - .kitchen.yml
 2018-04-10 10:11:35 -04:00
Daniel Wallace
b9efec8526
remove libnacl on windows 
We do not use raet on windows, so we don't need to install it
 2018-04-04 13:37:40 -05:00
rallytime
e75ba1f502
Merge branch '2018.3.0rc1' into '2018.3' 
Conflicts:
  - doc/topics/releases/2018.3.0.rst
 2018-04-03 10:27:23 -04:00
twangboy
5eed1682cb
Use 17.0.0 instead of the beta (17.0.0b3) 2018-03-28 12:40:37 -06:00
twangboy
1403e29d97
Rollback pyzmq to version 16.0.3 2018-03-28 12:24:08 -06:00