valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
77,776 Commits 24 Branches 182 Tags 341 MiB
eb61788f87
Commit Graph

77776 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
efa83bc6f0 Merge pull request #38976 from rallytime/develop-docstring-fixes 
More docstring fixes for the new sysmod doc test failures
 2017-01-26 12:58:34 -07:00
Nicole Thomas
ca090fff1a Add new logging options to parsers_test mock for develop (#38974) 2017-01-26 12:47:23 -07:00
Mike Place
e0af212c1b Remove unnecessary blank lines 
Needed for lint check
 2017-01-26 12:25:57 -07:00
Mike Place
9d4d1c37c4 repr flag to comment field 
to avoid interpretation of backslashes
 2017-01-26 12:18:05 -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
Mike Place
664748e959 Add documentation release note for change in system module (#38975) 
Refs #38968
 2017-01-26 12:09:17 -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
rallytime
089ad59b90 Update the vsphere execution module docs to satisfy failing doc test 
- Added the "CLI Example:" syntax to function that were missing it
- Added docs to functions missing any docs and CLI examples
- Added to functions to allow_failure in sysmod test as needed
- Also adjusted the ordering of the allow_failure structure to make it
  easier to see which modules/funcitons were included (alphabetize)
 2017-01-26 11:56:06 -07:00
Joseph Hall
ea8654f400 Typo 2017-01-26 11:42:22 -07: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
Mike Place
930af56299 Merge pull request #38960 from github-abcde/runners-pillar-pillarenv 
runners/pillar.py: Updated documentation to use pillarenv instead of …
 2017-01-26 11:39:58 -07:00
rallytime
5aa70bbbe7 Add "CLI Example:" language to satisfy doc test for solrcloud module 2017-01-26 11:31:59 -07:00
Mike Place
10b2224582 Merge pull request #38968 from raazvvann/dev/rheghedu/system-time 
system: change get_system_time returned format
 2017-01-26 11:28:29 -07:00
Mike Place
bd982c7122 Merge pull request #38969 from jakubjosef/develop 
Fixed generating job diffs in Jenkins state
 2017-01-26 11:22:59 -07:00
Mike Place
07f4c59a56 Merge pull request #38967 from raazvvann/dev/rheghedu/system-hostname 
system: add {set/get}_computer_name
 2017-01-26 11:01:08 -07:00
Joseph Hall
94050ff716 Watch out for bools 2017-01-26 11:00:43 -07:00
Jakub Josef
c64d2f88e5 Fixed generating job diffs in Jenkins state 2017-01-26 17:51:03 +01: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
Heghedus Razvan
5728490442 system: change get_system_time returned format 
Change returned format from "HH:MM AM/PM" to
"HH:MM:SS AM/PM"

Signed-off-by: Heghedus Razvan <razvan.heghedus@ni.com>
 2017-01-26 18:36:21 +02:00
Markus
7ff098426d comments on version number and git (#38961) 2017-01-26 09:21:16 -07:00
Heghedus Razvan
db41f60499 system: add {set/get}_computer_name 
Add {set/get}_computer_name for setting/getting
computer hostname. I add this in system module to be
the same as on windows, creating a cross-platform
way to interact with computer's hostname.

Signed-off-by: Heghedus Razvan <razvan.heghedus@ni.com>
 2017-01-26 17:47:41 +02: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
herbert.buurman
eefbcd22cb runners/pillar.py: Updated documentation to use pillarenv instead of saltenv when wanting to show the pillar of a specific environment. Added parsing of pillarenv argument so it actually gets used. 2017-01-26 11:57:50 +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
plassa-b
972de0d894 Replaced log.error by log.warning and added comments for the new feature 2017-01-26 00:13:38 +01: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
f9b2719ed3 Merge pull request #38942 from cloudflare/NET-RUNNER 
New runner: net finder
 2017-01-25 13:21:27 -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
5bea8bc5c1 Merge pull request #38943 from thatch45/ssh_pillar_master 
When we generate the pillar we should send in the master opts
 2017-01-25 13:10:19 -07: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
7ca6b81611 Merge pull request #38912 from daxroc/feature/http_wait_for_interval 
Enhanced wait_for_successful_query with request_interval
 2017-01-25 12:43:44 -07:00