valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
75,868 Commits 24 Branches 182 Tags 341 MiB
d7e05091a2
Commit Graph

75868 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rallytime
fdaa5ac1b0 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/master.py
  - salt/pillar/__init__.py
  - salt/utils/__init__.py
 2017-01-26 14:09:37 -07:00
Super-User
26eb35f99d fixes salt/salt-bootstrap#1021 2017-01-26 21:22:34 +01:00
Mike Place
0660cc3cf2 Merge pull request #38937 from HashBangDev/fix-smtp-ret-require-gnupg 
Fix smtp ret require gnupg
 2017-01-26 13:08:15 -07:00
Mike Place
d947c5c449 Merge pull request #38955 from techhat/issue38816 
Do a better job at error detection in runners
 2017-01-26 13:00:17 -07:00
Mike Place
e0af212c1b Remove unnecessary blank lines 
Needed for lint check
 2017-01-26 12:25:57 -07:00
Mike Place
04a5b05c36 Merge pull request #38953 from thatch45/thorium_keyfix 
fix an issue where thorium would remove keys of reattaching minions
 2017-01-26 12:15:58 -07:00
Thomas S Hatch
68e96b11ac This is faster and cleaner 2017-01-26 12:13:06 -07:00
Mike Place
399556b9fe Remove trailing whitespace 
Needed for lint check
 2017-01-26 12:12:22 -07:00
Mike Place
b66b6f6423 Merge pull request #38950 from mbom2004/2016.3 
Fixed Logstash Engine in file logstash.py
 2017-01-26 12:10:06 -07:00
Nicole Thomas
a6c6e47842 Handle changing "is_default" value in moto package for boto test mock (#38973) 2017-01-26 12:05:30 -07:00
Nicole Thomas
6b28a587e1 Add CLI Example for rest_sample_utils.get_test_string function (#38972) 
Fixes test_valid_doc test that is failing on 2016.11
 2017-01-26 12:04:38 -07:00
Mike Place
b965b5dcc2 Merge pull request #38952 from terminalmage/zd1168 
Make the ext_pillars available to pillar.ext tunable
 2017-01-26 12:01:55 -07:00
Joseph Hall
ea8654f400 Typo 2017-01-26 11:42:22 -07:00
Daniel Wallace
ebb9df3ec7 when using local_cache we have to pass the list of minions 2017-01-26 12:41:20 -06:00
Mike Place
27166fad4e Merge pull request #38957 from mcalmer/fix-rpm-install_date-timezone 
Fix timezone handling for rpm installtime
 2017-01-26 11:41:14 -07:00
Joseph Hall
94050ff716 Watch out for bools 2017-01-26 11:00:43 -07:00
Mike Place
ec690a0a12 Merge pull request #38965 from toanju/2016.11 
salt-cloud will use list_floating_ips for OpenStack
 2017-01-26 09:44:11 -07:00
Tobias Jungel
1253ce9b63 salt-cloud will use list_floating_ips for OpenStack 
this will use list_floating_ips as well for recent versions of
libcloud. To not break with current setups create_floating_ip is used in
case no free ip in the pool exists. The latter is as well a minor fixup
to #34280 (i.e. older versions of libcloud)
 2017-01-26 15:58:41 +01:00
Frantisek Kobzik
c7da9f87b6 Fix timezone handling for rpm installtime 
Previously datetime.fromtimestamp was used. If used without additional
parameters, this method returns date in the local timezone.

Our code took the result of fromtimestamp, appended 'Z' and returned
this string. This is wrong as 'Z' means UTC (the client code parses this
value as UTC, but it's in fact local time).

Fixed by using utcfromtimestamp.
 2017-01-26 11:31:53 +01:00
Arthur Vuillard
f308d13a17 log an error on gnupg absence instead of raising an exception 2017-01-26 10:53:01 +01:00
Joseph Hall
0142b0bcb3 Do a better job at error detection in runners 2017-01-25 16:51:18 -07:00
Thomas S Hatch
13d28a34a6 fix an issue where thorium would remove keys of reattaching minions 2017-01-25 15:30:56 -07:00
Erik Johnson
6b014e53fc Rename on_demand_pillar to on_demand_ext_pillar 2017-01-25 15:08:57 -06:00
Erik Johnson
d216f90c63 Document new on_demand_pillar option and add to config template 2017-01-25 14:43:14 -06:00
Erik Johnson
426b20f02f Add documentation for on-demand pillar to pillar.ext docstring 2017-01-25 14:37:57 -06:00
Erik Johnson
7b10274b6b Make on-demand ext_pillars tunable 2017-01-25 14:37:16 -06:00
Erik Johnson
d54723ccae Add on_demand_pillar config option 2017-01-25 14:36:41 -06:00
Mike Place
c09f39d6c9 Remove unused json import 2017-01-25 13:22:40 -07:00
Mike Place
d906e8fadb Merge pull request #38949 from clinta/x509-passphrase-bug 
Use signing passphrase as public passphrase when generating self-sign…
 2017-01-25 13:20:57 -07:00
Mike Place
de3b2cc97b Merge pull request #38929 from MTecknology/2016.11 
Fix psutil regressions in 2016.11
 2017-01-25 13:17:40 -07:00
Mike Place
3ec806c003 Merge pull request #38940 from isbm/isbm-sanitizers-fix-and-unit-test 
Isbm sanitizers fix and unit test
 2017-01-25 13:15:55 -07:00
Bo Maryniuk
a112b790fe Fix typo 2017-01-25 21:15:05 +01:00
Mike Place
2c4ad85a78 Merge pull request #38948 from rallytime/bump-template-context-deprecation 
Bump the template context deprecation version to Oxygen
 2017-01-25 12:45:58 -07:00
Mike Place
e420763285 Merge pull request #38944 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2017-01-25 12:44:42 -07:00
Mike Place
e4514ca7d8 Merge pull request #38946 from rallytime/bp-37632 
Back-port #37632 to 2016.3
 2017-01-25 12:40:39 -07:00
Mike Place
bd4889ac73 Merge pull request #38900 from cro/px_dunder_201611 
Enable __proxy__ availability in states, highstate, and utils. Enable __utils__ for proxies.
 2017-01-25 12:36:48 -07:00
matt.roberts@safesystems.com
249efa3068 Fixed Logstash Engine in file logstash.py 
Fixes #34551
 2017-01-25 14:34:14 -05:00
Clint Armstrong
c8697e38a8 Use signing passphrase as public passphrase when generating self-signed certificates 2017-01-25 14:21:25 -05:00
Mike Place
953a20350a Merge pull request #38913 from Adaephon-GH/patch-1 
Ignore plist files without Label key
 2017-01-25 12:07:26 -07:00
Mike Place
826dce1059 Merge pull request #38917 from twangboy/update_jinja_mac 
Update Jinja2 to 2.9.4
 2017-01-25 12:05:37 -07:00
Mike Place
f94b8798b6 Merge pull request #38918 from thatch45/thorium_typos 
Thorium typos
 2017-01-25 12:00:40 -07:00
Mike Place
32fbb945b7 Merge pull request #38919 from cachedout/issue_38543 
Correctly pass subset to cmd_subset
 2017-01-25 11:59:16 -07:00
Mike Place
6b3c738bfd Merge pull request #38922 from twangboy/fix_vcredist 
Fix 64bit detection, vcredist only on <= 2008
 2017-01-25 11:47:40 -07:00
Mike Place
954658523b Merge pull request #38923 from DSRCorporation/bugs/38371_fix_schedule_return 
Fixed broken __schedule_return handler.
 2017-01-25 11:45:30 -07:00
Mike Place
b27733cc33 Merge pull request #38925 from terminalmage/issue38540 
Fix two wheel issues in netapi
 2017-01-25 11:28:51 -07:00
Michael Lustfield
73a8c6d121 Load core grains only if required. 
As per discussion on github, these grains should only be loaded if
absolutely required.
 2017-01-25 12:24:20 -06:00
Mike Place
828e9bd8f9 Merge pull request #38927 from l2ol33rt/debian_doc_fix 
Adding explicit install of python-systemd in jessie-backports on Debian Guide
 2017-01-25 11:21:17 -07:00
rallytime
749e0031d7 Bump the template context deprecation version to Oxygen 
Refs #35777
 2017-01-25 11:17:37 -07:00
Mike Place
618596f0cc Merge pull request #38926 from gtmanfred/2016.3 
add note about pysss for pam eauth
 2017-01-25 11:12:19 -07:00
Daniel Wallace
9cae953c93 add note about pysss for pam eauth 2017-01-25 12:10:46 -06:00