1113 Commits

Author	SHA1	Message	Date
twangboy	9544624764	Add watchdog as a bundled dependency on Windows	2019-08-07 09:58:38 -06:00
Shane Lee	748bf1cb71	Merge branch '2019.2.1' into fix_pywin32_2019.2.1	2019-07-02 16:43:25 -06:00
Pedro Algarvio	5aee99bd56	Take into account the packaging requirements for OSX	2019-06-11 14:30:12 +01:00
Pedro Algarvio	b9618f6fa6	Take into account the packaging requirements for windows	2019-06-11 14:30:12 +01:00
twangboy	fb4090d175	update py3 script	2019-05-23 12:25:37 -06:00
twangboy	0ea70ba0c8	Don't remove pythonwin directory	2019-05-23 12:24:45 -06:00
twangboy	6f0b8e25ae	Add pymssql dependency for Windows builds	2019-05-02 16:59:27 -06:00
twangboy	9ec54c47c7	Add TLS support up to TLS 1.2	2019-04-12 13:44:49 -06:00
Ch3LL	a16891347c	Merge branch '2018.3' into '2019.2' ... Conflicts: - doc/conf.py - salt/modules/win_system.py - salt/states/boto3_route53.py	2019-03-05 16:00:05 -05:00
twangboy	e2d496cf94	Add zabbix to the Windows builds	2019-02-28 16:34:17 -07:00
Gareth J. Greenaway	e37fc20e7c	Merge branch '2018.3' into merge-2018.3 ... Conflicts: - doc/ref/modules/all/index.rst - salt/states/file.py - tests/unit/modules/test_yumpkg.py - tests/unit/modules/test_zypperpkg.py - tests/unit/states/test_file.py	2019-02-22 16:38:15 -08:00
Ch3LL	547889b375	Merge branch '2017.7' into '2018.3' ... Conflicts: - pkg/windows/build_env_2.ps1 - pkg/windows/req.txt - salt/_compat.py - salt/engines/slack.py - salt/modules/dockermod.py - salt/modules/git.py - salt/modules/heat.py - salt/modules/incron.py - salt/modules/lxc.py - salt/modules/memcached.py - salt/modules/network.py - salt/modules/nspawn.py - salt/modules/saltutil.py - salt/modules/win_network.py - salt/modules/yumpkg.py - salt/serializers/yaml.py - salt/states/heat.py - salt/states/module.py - salt/states/rabbitmq_policy.py - salt/states/virtualenv_mod.py - salt/states/win_system.py - salt/utils/master.py - tests/integration/cli/test_batch.py - tests/support/case.py	2019-02-15 14:38:26 -05:00
Gareth J. Greenaway	09fb3e7fc5	Merge branch '2019.2' into merge-2018.3	2019-02-13 10:32:21 -08:00
Daniel Wozniak	ba8d0eaa9a	Merge pull request #51547 from s0undt3ch/2017.7 ... [2017.7] Allow NOT to install pip dependencies	2019-02-13 11:14:36 -07:00
Pedro Algarvio	d2125aa38b	Allow NOT to install pip dependencies	2019-02-13 12:09:14 +00:00
Pedro Algarvio	5342305725	Allow NOT to install pip dependencies	2019-02-13 12:04:56 +00:00
Pedro Algarvio	8e009e0972	Allow NOT to install pip dependencies	2019-02-13 12:02:09 +00:00
Daniel Wozniak	4abd9d0462	Merge branch '2019.2' into merge-2018.3	2019-02-13 01:12:52 -07:00
Gareth J. Greenaway	6c99cb161f	Merge branch '2018.3' into merge-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/osx/build_env.sh salt/utils/dns.py tests/integration/netapi/rest_tornado/test_app.py tests/support/case.py tests/unit/utils/test_dns.py	2019-02-11 15:45:43 -08:00
twangboy	4177f64f28	Update url to libsodium for mac builds	2019-02-07 12:52:44 -07:00
Gareth J. Greenaway	05522c0867	Merge branch '2018.3.4' into add_py2_warning	2019-02-06 10:31:56 -07:00
Pedro Algarvio	af06d0d6b3	Merge branch '2019.2.0.rc1' into update_installer	2019-02-06 10:37:36 +00:00
twangboy	72fd1a2991	Roll back icon change	2019-01-31 17:56:16 -07:00
twangboy	63a53301bd	replace tabs with spaces	2019-01-31 17:51:01 -07:00
twangboy	7dd1704132	Add welcome_py2.rtf	2019-01-31 17:50:11 -07:00
twangboy	c93e9e39b9	Add Py2 Warning to installer package	2019-01-31 17:48:10 -07:00
Salt Admin	e049707b70	Select appropriate welcome.rtf	2019-01-31 17:38:22 -07:00
twangboy	c40ae65c48	Select correct version of welcome.rtf	2019-01-31 17:19:27 -07:00
Salt Admin	00794a208c	Add new logo, add welcome_py.rtf	2019-01-31 17:09:47 -07:00
twangboy	ea03c1e7ac	Remove alpha layer	2019-01-31 16:38:51 -07:00
twangboy	792ba1830a	Update installer graphic	2019-01-31 16:34:54 -07:00
twangboy	081fb40bd4	Remove unecessary !define for Py3, use default message	2019-01-31 16:01:03 -07:00
twangboy	b658900c01	Add Py2 Warning for Py2 Installer	2019-01-31 15:53:31 -07:00
twangboy	92e4f4e63a	Add Py2 warning, Update Icon and Graphic	2019-01-31 15:19:08 -07:00
Pedro Algarvio	d4d401b5d9	Merge branch '2019.2.0.rc1' into update_req_osx	2019-01-23 07:28:41 +00:00
twangboy	1d00b0543d	Rollback zeromq to 4.1.6	2019-01-16 14:22:22 -07:00
twangboy	c64698968d	Backport pyobjc	2019-01-15 16:39:49 -07:00
Lenard Fudala	f46e8bec76	Fix service name in minion plist	2019-01-15 15:35:18 -06:00
twangboy	dcc74f2692	Rollback two dependencies ... GitPython==2.1.10 CherryPy==17.4.1	2019-01-15 11:38:58 -07:00
twangboy	8d8a15c7ee	Rollback GitPython to 2.1.10	2019-01-15 11:36:40 -07:00
twangboy	ab38f89c1a	Downgrade CherryPy to 17.4.1	2019-01-14 20:46:58 -07:00
twangboy	ea0acbabf6	Update dependencies in req.txt for OSX	2019-01-14 17:39:29 -07:00
twangboy	3edfef31c1	Update dependencies in req.txt for Windows	2019-01-14 17:30:24 -07:00
twangboy	9992eb40c1	Update python to 2.7.15 and 3.5.4 for Windows installers	2019-01-09 16:08:57 -07:00
Gareth J. Greenaway	09815e7f77	Merge branch '2018.3' into merge-fluorine ... Conflicts: - salt/states/win_lgpo.py - salt/utils/minions.py	2019-01-01 13:50:01 -08:00
twangboy	32b9d2ad25	Update requests for osx	2018-12-27 12:03:00 -07:00
twangboy	e8b92338e9	Update requests on osx	2018-12-27 12:02:19 -07:00
twangboy	b22856f8ed	Update requests to 2.21.0	2018-12-27 12:01:15 -07:00
twangboy	4196690bbf	Update requests to 2.21.0	2018-12-27 11:58:46 -07:00
twangboy	0d4b799969	Upgrade requests to 2.20.1	2018-11-08 11:10:08 -07:00