twangboy
04c00827f1
Remove check for sudo
2017-12-07 17:31:31 -07:00
twangboy
b9f2863b60
Improvements to build scripts
...
Upgrade dependencies where available
Downloaded:
- libsodium to 1.0.15
- OpenSSL to 1.0.2n
- Python to 2.7.14
Pip:
- apache-libcloud to 2.2.1
- cffi to 1.11.2
- CherryPy to 13.0.0
- GitPython to 2.1.7
- idna to 2.6
- Jinja2 to 2.9.6
- pyasn1 to 0.4.2
- pyzmq to 17.0.0b3
- requests to 2.18.4
- six to 1.11.0
- tornado to 4.5.2
- cryptography to 2.1.4
- pyOpenSSL to 17.5.0
Update shasums for downloaded updates
Make the scripts self sudo themselves
Since we're forcing the script to run as sudo, remove individual sudo
calls
Move /opt/salt into variable $INSTALL_DIR in the build_env script
2017-12-07 17:21:36 -07:00
Michael Calmer
2b49a206bb
older logrotate need su directive
2017-12-07 17:31:48 +01:00
twangboy
041d6f7568
Roll back futures to 3.1.1 for py3 compat
2017-12-06 17:42:20 -07:00
twangboy
7ed11349b7
Remove CherryPy dependency
2017-12-06 17:09:38 -07:00
twangboy
8934d7fc41
Remove postinstall script, just do it in powershell
2017-12-06 15:47:37 -07:00
twangboy
d199ef5da0
Fix postinstall for pywin32
2017-12-06 09:10:02 -07:00
twangboy
da239bda24
Add Python 2.7.14 to clean_env.bat
2017-12-06 08:59:23 -07:00
twangboy
4bd0106c35
Fix pywin32 install
2017-12-06 08:50:11 -07:00
twangboy
1ba89026b2
Consolidate req file
2017-12-06 08:35:31 -07:00
twangboy
3263b0b97e
Update pip packages
2017-12-05 16:51:09 -07:00
Nicole Thomas
e52aac2587
Merge pull request #43649 from twangboy/win_installer_multimaster
...
Add support for multimaster setup
2017-10-19 09:20:44 -04:00
rallytime
b8dc018178
Merge branch '2017.7' into 'develop'
...
Conflicts:
- salt/modules/opkg.py
- salt/utils/templates.py
- tests/unit/templates/test_jinja.py
2017-10-18 09:37:47 -04:00
rallytime
c4ae4a6b50
Merge branch '2017.7.2' into '2017.7'
...
Conflicts:
- doc/topics/releases/2017.7.2.rst
2017-10-16 13:53:13 -04:00
twangboy
e9075725dc
Add documenting comments
2017-10-16 10:51:33 -06:00
twangboy
7fe2350365
Add support for multimaster setup
...
Allows you to pass a comma-delimited list of masters to the master combo
box or the /master command line switch
Parses the existing minion config file to get multimaster settings
Adds an checkbox to use the existing config in the minion config page
When the box is checked, show the existing config grayed out
When unchecked, show default values
Adss the /use-existing-config= command line switch for use from the
command line
Adds support for a help switch on the command line (/?) to display the
supported command line paramaters
2017-10-16 10:51:33 -06:00
rallytime
788ad0609a
Merge branch '2016.11' into '2017.7'
...
No conflicts.
2017-10-10 16:34:52 -04:00
apapp
87d676f08a
add -n with netstat so we don't resolve
2017-10-03 13:32:30 -04:00
apapp
0878dbd0e8
add -n with netstat so we don't resolve
2017-09-29 15:03:56 -04:00
Daniel Wallace
f7df41fa94
split build and install for pkg osx
2017-09-26 12:59:23 -06:00
rallytime
e0ae50e489
Merge branch '2017.7' into 'develop'
...
Conflicts:
- pkg/salt.bash
- salt/client/mixins.py
- salt/minion.py
- salt/modules/aptpkg.py
- salt/modules/boto_vpc.py
- salt/modules/win_pkg.py
- salt/utils/reactor.py
- tests/unit/utils/test_reactor.py
2017-09-22 10:24:04 -04:00
rallytime
a401166bd5
Merge branch '2017.7.2' into '2017.7'
...
No conflicts.
2017-09-21 09:52:38 -04:00
rallytime
57b9d642c2
Merge branch '2016.11.8' into '2016.11'
...
No conflicts.
2017-09-18 16:40:05 -04:00
twangboy
f33395f1ee
Fix logic in /etc/paths.d/salt
detection
2017-09-15 13:41:23 -06:00
twangboy
1b0a4d39d2
Fix logic in /etc/paths.d/salt
detection
2017-09-15 13:37:53 -06:00
rallytime
bfcfcd75e8
Merge branch '2017.7' into 'develop'
...
Conflicts:
- salt/fileclient.py
- salt/loader.py
- salt/minion.py
- salt/modules/alternatives.py
- salt/modules/genesis.py
- tests/unit/modules/test_hosts.py
- tests/unit/modules/test_ini_manage.py
2017-09-13 15:15:04 -04:00
rallytime
4251ce5a27
Merge branch '2016.11' into '2017.7'
...
Conflicts:
- pkg/windows/installer/Salt-Minion-Setup.nsi
- salt/version.py
2017-09-13 15:04:07 -04:00
twangboy
2d269d1a76
Change all comment markers to '#'
2017-09-12 12:59:57 -06:00
twangboy
6984b8fd60
Add /norestart to vcredist installer
2017-09-12 12:49:20 -06:00
twangboy
d80aea16cb
Handle ErrorCodes returned by VCRedist installer
2017-09-12 11:56:17 -06:00
twangboy
fb31e9a530
Add /norestart switch to vcredist install
2017-09-12 10:05:36 -06:00
Pablo Suárez Hernández
be4f26ab21
Use $HOME to get the user home directory instead using '~' char
2017-09-11 20:23:25 +02:00
rallytime
5701d54516
Merge branch '2017.7' into 'develop'
...
Conflicts:
- salt/state.py
- salt/utils/gitfs.py
2017-09-06 09:39:27 -04:00
twangboy
9979ccb613
Remove Py2 and Py3 in the same run
2017-08-31 14:15:06 -06:00
twangboy
a5d9f85db6
Modifications to build scripts
...
Py3 installs to c:\python35
Quote the path to the python install directory
Fix spellings in comments
Move pywin32 dlls to site-packages/win32 instead of python root
Remove pywin32 postinstall and testing scripts
Add passive switch to py3 uninstall
2017-08-31 11:41:13 -06:00
rallytime
0eafc59f33
Merge branch '2017.7' into 'develop'
...
Conflicts:
- salt/modules/win_groupadd.py
- salt/modules/yumpkg.py
- salt/state.py
- salt/utils/url.py
2017-08-23 10:07:01 -04:00
rallytime
328dd6aa23
Merge branch '2016.11' into '2017.7'
...
Conflicts:
- pkg/osx/pkg-scripts/postinstall
- pkg/osx/pkg-scripts/preinstall
2017-08-22 09:38:33 -04:00
twangboy
ef8a14cdf9
Remove /opt/salt instead of /opt/salt/bin
2017-08-18 12:19:04 -06:00
twangboy
2dd62aa1da
Add more information to the description
2017-08-18 12:09:08 -06:00
twangboy
f44f5b70dc
Only stop services if they are running
...
Otherwise it will cause an error and the installation will fail
2017-08-18 11:52:34 -06:00
twangboy
3b62bf953c
Remove salt from the path
2017-08-18 11:44:35 -06:00
twangboy
ebdca3a0f5
Update pkg-scripts
...
Improves logging
Removes /opt/salt/bin directory before install
Removes symlink to salt-config before install
2017-08-18 11:25:32 -06:00
rallytime
93c11d827a
Merge branch '2017.7' into 'develop'
...
Conflicts:
- salt/engines/slack.py
- salt/minion.py
2017-08-17 09:30:50 -04:00
twangboy
ffb23fbe47
Remove the line that wipes out the cache
2017-08-14 12:26:27 -06:00
rallytime
78e744bda4
Merge branch '2017.7' into 'develop'
...
Conflicts:
- salt/client/mixins.py
- salt/fileclient.py
- salt/modules/status.py
- tests/integration/states/test_npm.py
2017-08-14 14:21:17 -04:00
twangboy
a3becf8342
Change service shutdown timeouts
...
Windows default for stopping a service is 30 seconds. This changes the
default timeouts for the salt-minion service to more closely resemble
how it is handled in Windows. This gives Python a chance to cleanly exit
before being forcibly closed.
2017-08-14 11:19:09 -06:00
twangboy
28053a84a6
Change GitPython version to 2.1.1
...
Version 2.1.4+ requires git to be installed, usually in the form of xcode
command line tools. 2.1.3 has a memory leak problem, 2.1.2 is not
available. So that leaves 2.1.1.
2017-08-10 17:39:58 -06:00
rallytime
f20f3742cb
Merge branch '2017.7' into 'develop'
...
Conflicts:
- tests/unit/test_crypt.py
2017-08-07 10:43:06 -04:00
twangboy
8604312a7b
Remove master conf in minion install
2017-08-02 17:12:02 -06:00
rallytime
36a1bcf8c5
Merge branch '2016.11' into '2017.7'
...
Conflicts:
- salt/modules/win_wua.py
- salt/utils/schedule.py
- tests/unit/modules/rabbitmq_test.py
2017-07-27 14:00:15 -06:00
rallytime
9b66464fcc
Merge branch '2017.7' into 'develop'
...
No conflicts.
2017-07-27 13:52:52 -06:00
rallytime
1f0b90aa57
Merge branch '2017.7' into 'develop'
...
Conflicts:
- salt/cloud/clouds/joyent.py
- salt/engines/slack.py
2017-07-26 17:51:36 -06:00
twangboy
69d5973651
Compile scripts with -E -s params for python
2017-07-26 16:36:25 -06:00
twangboy
d55a44dd1a
Avoid loading user site packages
2017-07-26 14:21:41 -06:00
twangboy
9af1eb2741
Ignore any PYTHON* environment vars already on the system
2017-07-26 13:42:12 -06:00
twangboy
4e2fb03a95
Add pythonpath to batch files and service
2017-07-26 12:21:14 -06:00
twangboy
ac0e04af72
Remove build and dist, sign pkgs
2017-07-20 10:59:24 -06:00
twangboy
9d66e273c4
Fix hard coded pip path
2017-07-20 10:37:08 -06:00
twangboy
7b8d6cbbd2
Add support for Py3
2017-07-19 17:30:47 -06:00
twangboy
aa4eed93c8
Update Python and other reqs
2017-07-19 11:22:07 -06:00
twangboy
a7c910c31e
Remove build and dist directories before install
2017-07-18 11:36:38 -06:00
twangboy
0946002713
Add blank line after delete
2017-07-18 11:28:49 -06:00
twangboy
f7c0bb4f46
Remove build and dist directories before install
2017-07-18 11:23:16 -06:00
rallytime
8d960d463a
Merge branch '2017.7' into 'develop'
...
Conflicts:
- salt/grains/core.py
2017-07-06 17:42:30 -06:00
Mike Place
41514b886e
Merge pull request #42096 from twangboy/win_use_default_configs
...
Use default salt configs for Windows installs
2017-07-03 17:03:26 -05:00
twangboy
c1e899c0ca
Create Master installer if script is found
2017-07-03 13:54:27 -06:00
twangboy
7da86b3540
Use default salt configs for Windows installs
2017-07-03 13:33:24 -06:00
twangboy
e4183a6d1c
Fix comments
2017-07-03 10:27:04 -06:00
twangboy
984b736e14
Add missing batch file
2017-07-03 10:24:10 -06:00
rallytime
e512a29f08
Merge branch '2017.7' into 'develop'
...
Conflicts:
- salt/modules/state.py
- salt/modules/yumpkg.py
- salt/modules/zypper.py
- salt/states/pkg.py
- salt/version.py
- tests/unit/config/test_config.py
- tests/unit/modules/test_zypper.py
2017-06-28 11:31:53 -06:00
Pablo Suárez Hernández
30b12da58b
Enables salt-minion watchdog on init.d script for sysV
2017-06-20 17:28:40 +01:00
Michael Calmer
db295f6f06
special salt-minion.service file for rhel7
2017-06-20 17:28:39 +01:00
Silvio Moioli
22d884f478
Avoid failures on SLES 12 SP2 because of new systemd TaskMax limit (bsc#985112)
2017-06-20 17:28:39 +01:00
Michael Calmer
8c89378b0d
Run salt-api as user salt (bsc#990029)
2017-06-20 17:28:38 +01:00
Klaus Kämpf
0cf36b487b
Run salt master as dedicated salt user
...
* Minion runs always as a root
2017-06-20 17:13:00 +01:00
Klaus Kämpf
02b6d8ce42
tserong@suse.com -- We don't have python-systemd, so notify can't work
2017-06-20 17:09:14 +01:00
rallytime
add5b118a3
Merge branch '2017.7' into 'develop'
...
Conflicts:
- salt/modules/yumpkg.py
- tests/unit/templates/test_jinja.py
2017-06-19 14:12:36 -06:00
Mike Place
3cdd2fe96c
Merge pull request #41701 from twangboy/remove_win_unicode_console
...
Remove win_unicode_console dependency
2017-06-19 11:57:12 -05:00
twangboy
8b4e3ad77d
Upgrade psutil to version 5.2.2
2017-06-16 17:59:50 -06:00
rallytime
7fef4cf38f
Merge branch '2017.7' into 'develop'
...
Conflicts:
- salt/engines/slack.py
2017-06-15 10:57:27 -06:00
rallytime
16a2747d7d
Merge branch '2016.11' into '2017.7'
...
Conflicts:
- pkg/windows/buildenv/salt.bat
- salt/modules/pillar.py
- salt/utils/openstack/nova.py
- tests/unit/cloud/clouds/test_dimensiondata.py
- tests/unit/cloud/clouds/test_gce.py
2017-06-14 13:31:42 -06:00
rallytime
74d9a36d5a
Merge branch 'nitrogen' into 'develop'
...
Conflicts:
- pkg/salt-proxy@.service
- salt/modules/npm.py
- salt/modules/parted.py
- tests/integration/modules/test_libcloud_dns.py
2017-06-13 15:01:51 -06:00
twangboy
0d4be0220b
Add batch files for master
2017-06-12 15:48:46 -06:00
Nicole Thomas
435d6189bf
Merge pull request #41446 from cloudflare/proxy-file
...
[backport] salt-proxy: Fix systemd unit file to handle more proxy names
2017-06-12 12:33:20 -06:00
twangboy
e8a24db927
Remove win_unicode_console dependency
2017-06-12 11:56:18 -06:00
rallytime
093f96f84e
Merge branch '2016.11' into 'nitrogen'
...
No conflicts.
2017-06-08 16:45:34 -06:00
David Murphy
7ab3319090
Update notrim check, netstat takes minutes if large number connections - 260K
2017-06-07 10:47:06 -06:00
rallytime
396b06fdf8
Merge branch 'nitrogen' into 'develop'
...
No conflicts.
2017-06-07 09:54:20 -06:00
rallytime
1a40e105e5
Merge branch '2016.11' into 'nitrogen'
...
Conflicts:
- tests/integration/__init__.py
- tests/integration/modules/test_state.py
2017-06-06 12:57:44 -06:00
David Murphy
ffe492d6a9
Add symbolic link salt-proxy service similar to other service files
2017-06-01 16:05:46 -06:00
rongzeng
bd0f3a4359
fixed salt-minion initd file bug
...
if salt-minion has its grains, for using "salt-call --local config.get PARAM" get the right PARAM, should add "--skip-grains", or the script cant work normal.
2017-06-01 14:37:01 +08:00
rallytime
ff417db115
Merge branch 'nitrogen' into 'develop'
...
Conflicts:
- doc/topics/venafi/index.rst
- pkg/salt-proxy@.service
- salt/config/__init__.py
2017-05-26 11:27:24 -06:00
Mircea Ulinic
0c1221ea7b
Use the escaped name (%i) in the proxy description
2017-05-26 09:45:54 +00:00
Mircea Ulinic
ca6b07c415
Add salt-proxy service file to deb pkg
2017-05-26 09:38:11 +00:00
Jeremy McDermond
48f47e3925
salt-proxy: Fix systemd unit file to handle more proxy names
...
The current systemd unit file uses %I which gives the unescaped argument
to the script. This breaks if there are special characters in the proxy
name such as '-'. Using %i escapes the name when it's handed to the command
line allowing the use of those characters.
This change also adds the argument to the template to the unit name so that
it's a bit easier to see in systemctl.
Conflicts:
pkg/salt-proxy@.service
2017-05-26 09:35:22 +00:00
Mike Place
525b26c2b4
Merge pull request #41418 from twangboy/rem_raet_deps
...
Remove RAET dependencies from Windows Installer
2017-05-25 16:03:42 -05:00
rallytime
9ff2694155
Merge branch '2016.11' into 'nitrogen'
...
Conflicts:
- pkg/salt-minion.service
- salt/modules/junos.py
- salt/modules/localemod.py
- salt/modules/win_system.py
- salt/states/junos.py
- tests/unit/modules/test_localemod.py
- tests/unit/modules/test_win_powercfg.py
- tests/unit/states/dockerng_test.py
2017-05-24 16:32:59 -06:00
twangboy
c3a22dc0e7
Remove RAET deps, remove salt.bat
2017-05-24 16:22:43 -06:00
Mike Place
3a45ac30f0
Merge pull request #41401 from bdrung/systemd-service-documentation-key
...
Add documentation key to systemd service files
2017-05-24 10:49:54 -05:00
Benjamin Drung
33a7f8b2ec
Fix typos
...
lintian found several spelling errors.
Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>
2017-05-24 12:50:29 +02:00
Benjamin Drung
3f7f30895d
Add documentation key to systemd service files
...
Documentation for systemd service files can be automatically viewed
using systemctl help servicename if this field is present. Thus add the
relevant man page, the local and online documentation to the
documentation key.
2017-05-24 11:14:39 +02:00
Mike Place
3d142213b0
Merge pull request #41304 from mcdermj/proxy-systemd-fix
...
salt-proxy: Fix systemd unit file to handle more proxy names
2017-05-19 13:28:20 -05:00
Benedikt Heine
d54b893b71
convert whitespace tabs to spaces
2017-05-18 18:53:27 +02:00
Benedikt Heine
df290b7b09
expand tilde correctly in bashcompletion ( fixes #41302 )
2017-05-18 18:48:12 +02:00
Jeremy McDermond
72ce923fa1
salt-proxy: Fix systemd unit file to handle more proxy names
...
The current systemd unit file uses %I which gives the unescaped argument
to the script. This breaks if there are special characters in the proxy
name such as '-'. Using %i escapes the name when it's handed to the command
line allowing the use of those characters.
This change also adds the argument to the template to the unit name so that
it's a bit easier to see in systemctl.
2017-05-17 11:01:48 -07:00
rallytime
d75a7e0d0f
Merge branch 'nitrogen' into 'develop'
...
No conflicts.
2017-05-12 16:42:54 -06:00
Mike Place
c195d075cd
Merge pull request #41151 from twangboy/fix_py_install
...
Fix python 2.7.13 install, fix clean script
2017-05-12 12:31:29 -05:00
rallytime
e1bd7ce10a
Merge branch 'nitrogen' into 'develop'
...
No conflicts.
2017-05-11 13:03:59 -06:00
rallytime
4100e2b6a6
Merge branch 'nitrogen' into 'develop'
...
No conflicts.
2017-05-10 15:32:33 -06:00
rallytime
12a75c1108
Merge branch '2016.11' into 'nitrogen'
...
No conflicts.
2017-05-10 15:32:23 -06:00
twangboy
96918dcfa6
Add silent action to MsgBox for Path Actions
2017-05-10 11:22:18 -06:00
Mike Place
d1882e42dd
Merge pull request #40870 from twangboy/unicode_console
...
[DO NOT MERGE] Add win_unicode_console dependency
2017-05-09 13:09:20 -06:00
twangboy
53458b88e9
Fix python 2.7.13 install, fix clean script
2017-05-09 18:32:03 +00:00
rallytime
ecb962cdee
Merge branch 'nitrogen' into 'develop'
...
Conflicts:
- salt/runners/saltutil.py
2017-05-02 09:00:22 -06:00
twangboy
523316f0d7
Update Python and Deps
2017-04-28 17:19:15 -06:00
twangboy
fe20a576b5
Add win_unicode_console dep
2017-04-24 17:24:00 -06:00
rallytime
885419b3e7
Merge branch 'nitrogen' into 'develop'
...
No conflicts.
2017-04-17 13:27:58 -06:00
rallytime
9905eb7273
Merge branch 'nitrogen' into 'develop'
...
Conflicts:
- salt/netapi/__init__.py
2017-04-14 10:50:31 -06:00
rallytime
f552dd63f3
Merge branch '2016.11' into 'nitrogen'
...
Conflicts:
- pkg/windows/installer/Salt-Minion-Setup.nsi
- tests/unit/states/test_tomcat.py
2017-04-14 10:46:56 -06:00
twangboy
b6ac4aa86d
Fix service for win10 update
2017-04-13 13:51:15 -06:00
rallytime
17efc7341c
Merge branch '2016.11' into 'nitrogen'
...
Conflicts:
- salt/modules/win_wua.py
- salt/netapi/rest_cherrypy/app.py
- salt/version.py
- tests/unit/states/grains_test.py
- tests/unit/states/test_archive.py
2017-04-13 10:14:51 -06:00
rallytime
5282ea2480
Merge branch 'nitrogen' into 'develop'
...
No conflicts.
2017-04-13 09:46:05 -06:00
rallytime
749840ce5f
Merge branch 'nitrogen' into 'develop'
...
No conflicts.
2017-04-11 15:11:46 -06:00
rallytime
e90622bc22
Merge branch '2016.11' into 'nitrogen'
...
Conflicts:
- salt/modules/dockermod.py
- salt/modules/file.py
2017-04-11 15:03:34 -06:00
twangboy
0f7a81cd34
Keep network.py execution module
2017-04-11 14:13:31 -06:00
Matei Albu
ee911a74b4
suse specific changes to salt-api.service
...
* run service under user salt
* change type from notify to simple
* set SHELL env var. When passing a ProxyCommand option to salt-ssh a valid $SHELL is needed execute the given command
2017-04-11 09:19:23 +02:00
twangboy
f71d5cccde
Copy pywin32 dlls to python directory
2017-04-10 23:51:11 +00:00
Denys Havrysh
dae34b30f9
Add OpenRC init scripts for bootstrapping Alpine Linux from Git
2017-04-10 11:52:56 +03:00
Thomas Deutschmann
a177d7f0a1
salt-minion.service: Start after salt-master.service
...
On systems where you have both services, salt-master and salt-minion,
enabled, you want that salt-minion.service starts after
salt-master.service so that the minion will be able to connect to the
master on first attempt.
2017-04-03 11:43:00 +02:00
twangboy
90e5022e82
Fix nsis script error
2017-03-31 15:12:41 -06:00
rallytime
52edbffc85
Merge branch '2016.11' into 'develop'
...
Conflicts:
- doc/ref/cache/all/index.rst
- doc/topics/cache/index.rst
- salt/cache/localfs.py
- salt/modules/boto_rds.py
- salt/roster/cloud.py
- salt/states/virtualenv_mod.py
- tests/integration/states/test_archive.py
- tests/unit/modules/test_dockermod.py
- tests/unit/states/dockerng_test.py
2017-03-28 17:09:30 -06:00
rallytime
e77e86db3a
Merge branch '2016.3' into '2016.11'
...
No conflicts.
2017-03-27 17:27:49 -06:00
twangboy
3207d670c5
Fix osx build
2017-03-27 14:52:19 -06:00
rallytime
dbf74330ec
Merge branch '2016.11' into 'develop'
...
Conflicts:
- pkg/windows/req_base.txt
- salt/modules/ssh.py
2017-03-23 16:40:44 -06:00
rallytime
5c5b74b09a
Merge branch '2016.3' into '2016.11'
...
Conflicts:
- pkg/windows/req.txt
2017-03-22 17:20:58 -06:00
mguegan
a5b1d55c46
Fix ZMQ cython .so files linkage
2017-03-22 22:03:53 +01:00
mguegan
15359d1a33
Fix esky build-tarball shellscript for SmartOS 2016Q4-LTS
...
- Add `libssp.so.0` (not sure of this one)
- Copy libsodium/libzmq to the ld_library_path
2017-03-22 19:28:53 +01:00
mguegan
340cbfec63
Update build instructions for esky / SmartOS (2016Q4 LTS)
...
- Remove duplicates
- Adding `-lssp` for fix linking of `console.exe` (bbfreeze)
- Remove patchelf which will break bbfreeze `(version not found)`
- Update to latest saltstack repository branch
2017-03-22 19:25:14 +01:00
twangboy
6761527793
Update dependencies for PyOpenSSL
2017-03-21 11:03:20 -06:00
twangboy
5f75ca71dd
Update dates in the env scripts
2017-03-11 22:21:40 -07:00
twangboy
02757db1e4
Add python 3 installer for Windows
2017-03-10 21:52:38 +00:00
cDR
6539dbdbca
Do not use name resolving for --notrim check
...
This causes a significant delay on servers with many open connections
2017-03-06 09:06:20 -07:00
Pedro Algarvio
878e770088
Bump required SaltPyLint version
2017-03-06 15:28:58 +00:00
Joseph Hall
829f7008f1
Fill in a couple more spots
2017-03-02 05:27:20 -07:00
Pedro Algarvio
1dd7d8d88f
Require SaltPyLint >= v2017.2.22
...
Minimal Python version for develop is now 2.7
2017-02-22 12:15:31 +00:00
rallytime
c46f82c029
Merge branch '2016.11' into 'develop'
...
Conflicts:
- requirements/dev_python27.txt
- requirements/dev_python34.txt
2017-02-21 14:20:20 -07:00
rallytime
dda39d4e63
Merge branch '2016.11' into 'develop'
...
Conflicts:
- salt/minion.py
- salt/modules/file.py
- salt/modules/grains.py
- salt/utils/gitfs.py
2017-02-16 12:18:46 -07:00
twangboy
8dd915dae4
Add salt icon to buildenv directory
2017-02-16 12:04:21 -07:00
twangboy
98d5cc3e1b
Add additional tests to the Windows whitelist
2017-02-15 21:21:55 +00:00
twangboy
ef5078729a
Capitalize the 'r' for 2008R2
2017-02-09 09:55:59 -07:00