Commit Graph

87095 Commits

Author SHA1 Message Date
Daniel A. Wozniak
c4d7a4352c
Add debug log when connecting 2018-11-13 14:04:04 -07:00
Daniel A. Wozniak
4f81432321
Set subscribe via sockopt for better compatibility 2018-11-11 02:17:45 -07:00
Daniel A. Wozniak
6882209e3b
More reliable pub server publishing
- Uses existing zmq context
- Store socket in thread local storage for re-use
- Add tests to verify publish reliability
2018-11-11 00:58:47 -07:00
Nicole Thomas
c85561ee56
Merge pull request #50442 from rallytime/replace-docbanner
Update docbanner hyperlink
2018-11-08 17:10:32 -05:00
rallytime
193325d58a
Update docbanner hyperlink 2018-11-08 17:05:13 -05:00
Nicole Thomas
72005688e5
Merge pull request #50439 from rallytime/bootstrap-contributing-docs
Add bootstrap section to contributing docs
2018-11-08 16:53:08 -05:00
Nicole Thomas
cca7a365cd
Merge pull request #50441 from rallytime/replace-docbanner
Update SaltConf doc banner
2018-11-08 16:52:45 -05:00
rallytime
2af92bd647
Update SaltConf doc banner 2018-11-08 16:42:29 -05:00
rallytime
d2158aa0fa
Add bootstrap section to contributing docs
Fixes #34089
2018-11-08 16:03:19 -05:00
Mike Place
1e72d20f7d
Merge pull request #50414 from flassman/backmerge-for-typeerror-windows-python3
use exc.winerror not exc[0] to avoid python3 TypeError
2018-11-08 09:38:33 -07:00
Nicole Thomas
93095cbd45
Merge pull request #50415 from flassman/pass-cwd-to-runas_system
cwd needs to be passed from runas() to runas_system()
2018-11-08 11:14:55 -05:00
Friedmund Lassmann
0113137a20 cwd needs to be passed from runas() to runas_system()
Fixes parts of #47787
2018-11-07 15:06:39 +01:00
Friedmund Lassmann
20fff15e89 use exc.winerror not exc[0] to avoid python3 TypeError
Fixes #50413
2018-11-07 12:49:49 +01:00
Mike Place
ef4509e779
Merge pull request #50370 from dwoz/pubd_msg_logs
Log message flow to publish daemon
2018-11-05 12:32:01 -07:00
Nicole Thomas
cd7c95f200
Merge pull request #50128 from mgomersbach/fix-py3-reload-compat
Workaround for py2 builtin, =<3.3 imp and >=3.4 libimport quirks
2018-11-05 12:32:31 -05:00
Nicole Thomas
aa6b149af7
Merge pull request #50354 from rallytime/version_num_docs
Add a few more feature release codenames to the version_numbers doc
2018-11-05 10:46:45 -05:00
Nicole Thomas
6472100125
Merge pull request #50359 from dwoz/clitest
Increase cli batch test timeout for increased reliablity
2018-11-05 09:15:02 -05:00
Daniel A. Wozniak
58ced12b57
log jid to payload size 2018-11-03 17:51:49 -07:00
Daniel A. Wozniak
3c537b5550
Log message flow to publish daemon 2018-11-03 17:43:00 -07:00
Mark Gomersbach
e453e82772
Satisfy pylint, use naming instead of W or E classification 2018-11-03 09:29:40 +01:00
Mark Gomersbach
d20581c962
Merge branch 'fix-py3-reload-compat' of github.com:mgomersbach/salt into fix-py3-reload-compat 2018-11-03 09:22:20 +01:00
Mark Gomersbach
5cd9741269
Satisfy pylint 2018-11-03 09:21:41 +01:00
Mark Gomersbach
48c6a4f6c0
Merge branch '2017.7' into fix-py3-reload-compat 2018-11-03 09:16:30 +01:00
Daniel A. Wozniak
18b5d43d09
Increase cli batch test timeout for increased reliablity 2018-11-02 17:15:31 -07:00
Daniel Wozniak
99c8f356eb
Merge pull request #50345 from dwoz/pub_d_logging
Configure logging for ZMQ PubServer daemon
2018-11-02 12:40:31 -07:00
Mark Gomersbach
a2838dbd05
Satisfy pylint checks 2018-11-02 17:52:21 +01:00
rallytime
0621f7dd2e
Add a few more feature release codenames to the version_numbers doc 2018-11-02 12:15:53 -04:00
Nicole Thomas
44f7af4897
Merge pull request #50350 from dubb-b/2017.7
Updating the AMI's and sizes for the test run.
2018-11-02 09:51:59 -04:00
Daniel A. Wozniak
fd585231a1
Fix linter warnings
Fixes "Arguments number differs from overridden 'pre_fork' method'
2018-11-01 23:10:48 -07:00
Daniel A. Wozniak
5e1db3c6a7
Fix ZMQ PubServer daemon logging works on winndows
Make the api to ZMQ PubServer more similar to tcp pubserver
2018-11-01 22:16:37 -07:00
Brett Benassi
346a8317b1
Updating the AMI's and sizes for the test run. 2018-11-01 19:05:49 -06:00
Daniel A. Wozniak
889983223d
Configure logging for ZMQ PubServer daemon 2018-11-01 13:44:12 -07:00
Nicole Thomas
b947a18500
Merge pull request #50274 from rallytime/bp-41472
Back-port #41472 to 2017.7
2018-11-01 15:45:34 -04:00
Mike Place
4725acd4e0
Merge pull request #50195 from damon-atkins/jenkins_pylint
Jenkins CI Lint capture additional info
2018-11-01 18:42:59 +01:00
Mark Gomersbach
05c598c75e
Fix import error by utilizing six and strict version spec 2018-11-01 15:05:16 +01:00
Mark Gomersbach
95174e66f4
Merge branch '2017.7' into fix-py3-reload-compat 2018-11-01 14:38:40 +01:00
Nicole Thomas
ab8e8450c7
Merge pull request #50329 from twangboy/fix_cloud_winrm
Check WinRM port before initiating connection
2018-11-01 09:06:41 -04:00
twangboy
cf5fb04c04
Check WinRM port before initiating connection 2018-10-31 10:50:42 -06:00
Nicole Thomas
e535b3846c
Merge pull request #50252 from dwoz/backport_fs_fix
[2017.7] backport - Do not allow age to be a negative number
2018-10-30 12:31:10 -04:00
Nicole Thomas
11fa33e41d
Merge pull request #50295 from dubb-b/remove-cloud-change
Removing an un needed change and maybe fixing the lint error
2018-10-30 11:27:22 -04:00
Brett Benassi
80982ada82
Removing an un needed change and maybe fixing the lint error 2018-10-29 15:30:51 -06:00
Nicole Thomas
e00c507670
Merge pull request #50287 from whytewolf/boto_vpc
minor correction to boto_vpc.route_table_present example
2018-10-29 14:24:12 -04:00
Thomas "Whytewolf" Phipps
5a396441a3
minor correction to boto_vpc.route_table_present example, subnet_names was on wrong indent level 2018-10-29 11:15:57 -07:00
Daniel Wallace
37ae06cefb
Merge pull request #50280 from gtmanfred/2017.7
fix InstallRequirement.from_line for pip 18.1
2018-10-29 12:10:03 -05:00
Nicole Thomas
6ae8a33ced
Merge pull request #50281 from dubb-b/add_subnet
Add subnet
2018-10-29 11:20:12 -04:00
Nicole Thomas
4fdcf7c4a7
Lint: Add extra blank line 2018-10-29 11:17:12 -04:00
Brett Benassi
cebfd8ad03
Fixing lint error 2018-10-29 09:08:48 -06:00
Brett Benassi
0da6301d5a
Merge branch '2017.7' of https://github.com/saltstack/salt into add_subnet 2018-10-29 08:58:05 -06:00
Brett Benassi
2df611565a
Adding subnetID so it knows the right VPC to build the node in. 2018-10-29 08:57:22 -06:00
Daniel Wallace
58080747e1
fix InstallRequirement.from_line for pip 18.1
Fixes #49967
2018-10-29 09:53:21 -05:00