valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
79,585 Commits 24 Branches 182 Tags 341 MiB
186a6c4f2a
Commit Graph

79585 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yuri Grigorov
d1cbfd9f1d Allow scheduled job to run if runtime is in the past 2017-03-17 11:23:22 +02:00
Erik Johnson
9b71ff7ba4 PY3 compatibility: str does not have a 'decode' attr as it only stores unicode 2017-03-16 23:16:35 -05:00
Erik Johnson
24e2e17b5e Use salt.utils.to_str instead of bytes.decode 2017-03-16 23:05:22 -05:00
Erik Johnson
0158228315 PY3 compatibility: Ensure bytes generated by pycrypto are decoded to str 2017-03-16 22:40:31 -05:00
Erik Johnson
8676f7d14a Add pip3 to list of commands in which_bin test 2017-03-16 22:07:52 -05:00
Erik Johnson
a81fb1bb15 PY3 compatibility: write bytestring when file opened with 'wb' 2017-03-16 21:41:23 -05:00
rallytime
caebd5d8cf Merge branch '2016.11' into 'develop' 
Conflicts:
  - doc/topics/targeting/nodegroups.rst
  - salt/runners/manage.py
 2017-03-16 17:23:57 -06:00
rallytime
ef1ff38f8d Merge branch '2016.3' into '2016.11' 
No conflicts.
 2017-03-16 17:07:21 -06:00
Sergey Kizunov
eb9a0a6fd1 When building up the 'master_uri_list', do not try to connect 
The connection attempts will happen later, sequentially. This will
avoid a case where it can't connect to a salt-master later in the
list but can connect to an earlier one. Before the fix, it will take
extra time while the later connection attempts fail, even though
it won't need to use them.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
 2017-03-16 16:26:54 -05:00
Mike Place
b3415bc8fc Merge pull request #40039 from msciciel/module-sysctl-avoid-multiple-listings 
Avoid listing all sysctl in linux_sysctl module
 2017-03-16 15:25:45 -06:00
Sergey Kizunov
880790f743 dns_check should not try to connect when connect=False 
`dns_check` was still attempting to connect when `connect=False`
was used. Fix this use case.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
 2017-03-16 16:24:47 -05:00
Mike Place
0bdf240dcc Merge pull request #40049 from bodhi-space/infra4506 
INFRA-4506 - boto_lambda: add ability to pass SecurityGroupNames and SubnetNames in VpcConfig dict
 2017-03-16 15:21:50 -06:00
twangboy
c76717bf17 Fix problems with the test suite on Py3 2017-03-16 15:10:36 -06:00
Mike Place
cf8dd2ce29 Merge pull request #40066 from jeanpralo/dockercompose-remove-max-version-check 
Remove max version check on dockercompose
 2017-03-16 15:01:48 -06:00
Mike Place
9ef3e070c2 Merge pull request #40077 from cloudflare/fix-39771 
Fix #39771 (Empty __proxy__ dunder inside scheduler)
 2017-03-16 14:56:01 -06:00
Mike Place
c1002a6928 Merge pull request #40067 from techhat/runnerfetch 
Add fetch function to cache runner
 2017-03-16 14:53:41 -06:00
Nicole Thomas
116201f345 Merge pull request #40059 from terminalmage/fix-virtualenv-traceback 
Fix traceback when virtualenv.managed is invoked with nonexistant user
 2017-03-16 14:46:42 -06:00
Mike Place
24d52ff66b Merge pull request #40080 from cloudflare/statuspage-update 
Improvements for the statuspage state
 2017-03-16 14:46:16 -06:00
Mike Place
d5040a1c25 Merge pull request #40082 from cloudflare/update-capirca 
Capirca should be able to use non-int ports
 2017-03-16 14:44:53 -06:00
Mike Place
a870383387 newline for lint 2017-03-16 14:39:10 -06:00
Nicole Thomas
b12720a56f Merge pull request #40088 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2017-03-16 13:58:43 -06:00
Erik Johnson
6b7ba07841 PY3 compatibility: don't use cmp in sorted() 2017-03-16 14:49:47 -05:00
Nicole Thomas
a01b52b9a3 Merge pull request #40090 from rallytime/bp-40056 
Back-port #40056 to 2016.3
 2017-03-16 13:42:57 -06:00
Thomas S Hatch
ae012db87a update mention bot blacklist 2017-03-16 12:15:07 -06:00
Nicole Thomas
d1570bba4c Merge pull request #40057 from cachedout/ollie_blacklist 
More mentionbot blacklists
 2017-03-16 12:10:10 -06:00
Nicole Thomas
d64dee46bd Merge pull request #40061 from rallytime/merge-develop 
[develop] Merge forward from 2016.11 to develop
 2017-03-16 11:16:52 -06:00
Nicole Thomas
0ac2e83d37 Merge branch '2016.3' into ollie_blacklist 2017-03-16 11:01:10 -06:00
Erik Johnson
3923305141 Sort list of minions in batch to make tests consistent 2017-03-16 12:00:38 -05:00
rallytime
626bd03885 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/runners/manage.py
 2017-03-16 10:43:18 -06:00
Devin Christensen
dc0dbb5949 Fix documentation 2017-03-16 10:41:04 -06:00
Nicole Thomas
703ab23953 Merge pull request #40055 from rallytime/doc-build-warnings 
Update "yaml" code-block references with "jinja" where needed
 2017-03-16 10:30:37 -06:00
Devin Christensen
63491b5e6d Add gpg ext pillar to decrypt all pillar data 2017-03-16 10:24:44 -06:00
Mircea Ulinic
e2da56c6b8 Strip unused import 2017-03-16 16:14:00 +00:00
Mircea Ulinic
451b9e70e5 Avoid global 2017-03-16 15:55:05 +00:00
Nicole Thomas
d36bdb1a6e Merge pull request #40070 from Ch3LL/2016.3.6_release 
update 2016.3.6 release notes with additional PR's
 2017-03-16 09:43:21 -06:00
Nicole Thomas
e73a1d0e54 Merge pull request #40072 from meaksh/2016.11-handling-timeouts-for-manage.up-runner 
[2016.11] Allows overriding 'timeout' and 'gather_job_timeout' to 'manage.up' runner call
 2017-03-16 09:31:46 -06:00
Nicole Thomas
39a6392fa2 Merge pull request #40079 from cloudflare/add-logmod-doc 
Add logmod doc
 2017-03-16 09:12:29 -06:00
Mircea Ulinic
7410f201bd Fix netacl state doc 2017-03-16 15:04:26 +00:00
Mircea Ulinic
edae0b385b Fix doc link 2017-03-16 15:01:04 +00:00
Mircea Ulinic
6eab556c6f Capirca should be able to use non-int ports 
Adding feature to allow capirca_acl module to translate ports
specified using the service name to their integer value,
as mapped in the IANA /etc/services file
 2017-03-16 14:57:10 +00:00
Mircea Ulinic
be2b98d16a Improvements for the statuspage state 2017-03-16 14:17:17 +00:00
Mircea Ulinic
c92b42d9af Add logmod doc 2017-03-16 14:00:39 +00:00
Mircea Ulinic
cd319e7e39 Add proxy kwarg to scheduler 2017-03-16 12:27:49 +00:00
Mircea Ulinic
c6e6dd1a04 ProxyMinion: correctly build the scheduler 2017-03-16 12:24:13 +00:00
Pablo Suárez Hernández
40246d3723 Allows to set custom timeouts for 'manage.up' and 'manage.status' 2017-03-16 09:01:56 +00:00
Pablo Suárez Hernández
ad232fdc01 Allows to set 'timeout' and 'gather_job_timeout' via kwargs 2017-03-16 09:01:56 +00:00
Pedro Algarvio
89eeba2354 Merge pull request #40069 from terminalmage/py3-tests 
Test optimizations/fixes
 2017-03-16 07:03:22 +00:00
Ch3LL
a1f8b49bd1 update 2016.3.6 release notes with additional PR's 2017-03-15 16:34:17 -06:00
Erik Johnson
5b71db29d5 Use user.present/absent states to manage user in virtualenv test 2017-03-15 17:18:25 -05:00
Erik Johnson
5f99b0482a Don't use _ret as a variable name when ret is used in the same function 
This makes the code much easier to read.
 2017-03-15 17:17:48 -05:00