valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
94,251 Commits 24 Branches 182 Tags 341 MiB
2a84a1c47f
Commit Graph

1000 Commits

Author SHA1 Message Date
plastikos
2ddd589f68
Merge branch 'develop' into improvement-spm-base_paths 2018-05-17 23:09:05 -06:00
plastikos
52248ff433
Merge branch 'develop' into improvement-spm-base_paths 2018-05-15 10:36:03 -06:00
Noah Birnel
21d2390360 specify whitespace not space on parser -L 2018-05-14 10:41:43 -07:00
rallytime
cf58ae22bf
Merge branch '2018.3' into 'develop' 
Conflicts:
  - salt/states/pip_state.py
  - tests/unit/utils/test_stringutils.py
 2018-05-09 11:40:54 -04: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
Thayne Harbaugh
a66802c75a Various clean-ups, fixes and improvements to SPM directory references 
in the base paths used in syspaths.py.
 2018-05-04 17:41:57 -06:00
twangboy
9d498293b1
Remove unused settings, update NSIS 2018-05-03 16:46:03 -06:00
rallytime
5a071c5ddf
Merge branch '2018.3' into 'develop' 
Conflicts:
  - salt/cloud/clouds/azurearm.py
 2018-04-30 16:33:13 -04:00
twangboy
5549d83aae
Use ssm instead of nssm 2018-04-25 23:14:28 +00:00
rallytime
0eab957281
Merge branch '2018.3' into 'develop' 
Conflicts:
  - salt/netapi/rest_tornado/saltnado.py
  - tests/integration/states/test_file.py
  - tests/integration/states/test_git.py
  - tests/unit/modules/test_tls.py
 2018-04-20 15:40:49 -04: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
fe10957ce0
Merge branch '2018.3' into 'develop' 
Conflicts:
  - salt/cloud/clouds/azurearm.py
 2018-04-12 11:00:14 -04:00
rallytime
2f1cf3e511
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - .kitchen.yml
 2018-04-10 10:11:35 -04:00
rallytime
5b50eaf6b0
Merge branch '2018.3' into 'develop' 
Conflicts:
  - doc/ref/proxy/all/salt.proxy.cimc.rst
  - doc/ref/proxy/all/salt.proxy.panos.rst
  - doc/topics/releases/2018.3.0.rst
  - salt/modules/cmdmod.py
  - salt/modules/state.py
  - salt/utils/schedule.py
  - tests/integration/modules/test_state.py
 2018-04-05 13:25:46 -04:00
Mike Place
51d424e9cb
Merge pull request #46090 from rongzeng54/fix_for_initscript 
modify _get_pid by pidfile
 2018-04-04 16:05:52 -05: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
rallytime
e312efb5e7
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
  - salt/modules/cmdmod.py
  - salt/modules/pillar.py
  - salt/modules/yumpkg.py
  - salt/state.py
  - salt/utils/pkg/rpm.py
  - salt/utils/schedule.py
  - tests/integration/states/test_npm.py
  - tests/integration/states/test_pkgrepo.py
 2018-03-27 16:31:55 -04:00
rallytime
2c4668a5cb
Merge branch '2018.3' into 'develop' 
Conflicts:
  - salt/modules/kubernetes.py
  - salt/states/netconfig.py
  - salt/states/zfs.py
  - tests/integration/cloud/providers/test_profitbricks.py
  - tests/integration/scheduler/test_eval.py
  - tests/unit/grains/test_core.py
  - tests/unit/test_pillar.py
 2018-03-27 11:57:29 -04:00
rallytime
00d4eb26f3
Merge branch '2018.3.0rc1' into '2018.3' 
Conflicts:
  - pkg/windows/req.txt
 2018-03-27 11:41:56 -04:00
twangboy
77439948cc
Bring #46310 into 2018.3.0rc1 2018-03-22 13:27:14 -06:00
twangboy
fa0b0efe46
Fix some installer script inconsistencies 2018-03-20 09:54:36 -06:00
rallytime
8d1e1e7f94
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - .kitchen.yml
  - Gemfile
  - pkg/windows/build_env_2.ps1
  - pkg/windows/build_env_3.ps1
  - pkg/windows/req.txt
  - salt/client/ssh/__init__.py
  - salt/client/ssh/ssh_py_shim.py
  - salt/modules/boto_vpc.py
  - salt/modules/file.py
  - salt/modules/heat.py
  - salt/modules/smartos_vmadm.py
  - salt/modules/win_dsc.py
  - salt/returners/elasticsearch_return.py
  - salt/runners/salt.py
  - salt/states/module.py
  - salt/utils/win_functions.py
  - setup.py
  - tests/integration/modules/test_state.py
  - tests/unit/grains/test_core.py
  - tests/unit/test_pillar.py
 2018-03-15 17:22:05 -04:00
rallytime
651dcaff66
Merge branch '2018.3' into 'develop' 
Conflicts:
  - tests/integration/states/test_file.py
 2018-03-12 11:53:21 -04:00
Nicole Thomas
4c8d9026d3
Merge pull request #46428 from twangboy/win_fix_reqs 
Fix issue with dev env install on Windows
 2018-03-09 09:52:45 -05:00
Benjamin Drung
3d37eca847 Fix various spelling mistakes 
lintian found various spelling mistakes.

Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>
 2018-03-08 19:14:42 +01:00
Benjamin Drung
a3c54b50f6 Fix various spelling mistakes 
lintian found various spelling mistakes.

Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>
 2018-03-08 15:25:42 +01:00
twangboy
e7ab97cc17
Remove six as a hard dep for Salt 2018-03-07 12:26:37 -07:00
twangboy
cc67e5c2ef
Set six to 1.11.0 
CherryPy has a requisite of six>=1.11.0 and salt had a requisite of
six==1.10.0 which was causing a problem in the dev environment
 2018-03-07 11:52:17 -07:00
twangboy
bcf8b19566
Update the installer build 
Fixes some issues with Py3 not building
Brings the 2 build_env files more in line with each other
Fixes some typos in the build_env scripts
Removes the need for seperate req files for Py2 and Py3
Setup.py uses the windows req file on Windows
Removes the need to install pycrypto and pyyaml in setup.py. They are
now handled in the req.txt
Uses pypi resources instead of downloading .whl files and .exes for
dependencies
Updates nssm version to address the issue in #46192
Removes nssm from buildenv and downloads 32 and 64 bit versions of nssm
in build_pkg.bat
Removes the AppNoConsole=1 setting from the nsis script since it is not
needed with the new version of nssm
 2018-03-02 13:04:48 -07:00
zr
97356ceab9 modify _get_pid by pidfile 2018-02-18 00:24:07 +08:00
Nicole Thomas
ece4452953
Merge pull request #45078 from aphor/macports 
update macports doc, portfile
 2018-02-15 14:17:33 -05:00
rallytime
ca1f8a3b59
Merge branch '2017.7' into 'oxygen' 
Conflicts:
  - salt/modules/gnomedesktop.py
  - salt/utils/cloud.py
 2018-01-29 12:51:36 -05:00
Nicole Thomas
9fb4d4a528
Merge pull request #45688 from bdrung/raise-max-open-files 
Raise LimitNOFILE to default max open files
 2018-01-29 09:26:56 -05:00
rallytime
0ad101d560
Merge branch '2017.7' into 'oxygen' 
Conflicts:
  - doc/man/salt.7
  - salt/modules/git.py
  - salt/modules/pacman.py
  - salt/states/git.py
  - tests/integration/modules/test_mac_user.py
  - tests/support/parser/__init__.py
 2018-01-26 17:27:03 -05:00
rallytime
8e3a2e25fe
Merge branch '2016.11' into '2017.7' 
Conflicts:
  - salt/modules/git.py
 2018-01-26 15:17:56 -05:00
Benjamin Drung
bbedeec756 Raise LimitNOFILE to default max open files 
The configuration option max_open_files defaults to 100,000, but the
salt-master service is only started with a limit of 16,384 open files.
Therefore the higher limit cannot be applied and there will be a log
message:

Current values for max open files soft/hard setting: 16384/16384
The value for the 'max_open_files' setting, 100000, is higher than what
the user running salt is allowed to raise to, 16384. Defaulting to
16384.

This is related to #40173.
 2018-01-25 16:17:48 +01:00
twangboy
52d6d78150
Only keep ssh.py in the Windows installer 2018-01-17 14:00:10 -07:00
twangboy
54eb0db2c4
Keep ssh state and execution modules in the installer 2018-01-17 13:49:39 -07:00
rallytime
60370f5fb6
Merge branch '2017.7' into 'oxygen' 
Conflicts:
  - salt/config/__init__.py
  - salt/daemons/masterapi.py
  - salt/proxy/dummy.py
  - salt/states/file.py
  - tests/integration/modules/test_state.py
  - tests/integration/runners/test_runner_returns.py
  - tests/integration/ssh/test_state.py
  - tests/support/parser/__init__.py
  - tests/unit/grains/test_core.py
  - tests/unit/states/test_file.py
 2018-01-11 16:00:08 -05:00
Johannes Renner
530ddd2d29
Set SHELL environment variable 
When passing a ProxyCommand option to salt-ssh a valid $SHELL is needed to execute the given command.
 2018-01-11 13:37:38 +01:00
Nicole Thomas
888557c8c8
Merge pull request #45304 from twangboy/win_add_pythonnet 
Add pythonnet dependency for Windows
 2018-01-09 16:32:17 -05:00
Nicole Thomas
bf38bdca6c
Merge pull request #45280 from rallytime/merge-oxygen 
[oxygen] Merge forward from 2017.7 to oxygen
 2018-01-09 15:37:52 -05:00
twangboy
2c47d03150
Add pythonnet dependency for Windows 2018-01-05 13:44:30 -07:00
twangboy
187a420327
Copy not move dlls for PY2 2018-01-04 17:15:00 -07:00