valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
70,268 Commits 24 Branches 182 Tags 341 MiB
c2f23bc45e
Commit Graph

70268 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christian McHugh
c2f23bc45e Fix slack engine to run on python2.6 2017-01-03 10:50:47 -05:00
Mike Place
ec60f9c721 Merge pull request #38487 from gtmanfred/2016.3 
Fix crontab issues with spaces
 2017-01-01 13:33:29 -07:00
Mike Place
c5ba11b5e0 Merge pull request #38491 from gtmanfred/timing 
Use UTC for timing in case timezone changes
 2017-01-01 13:30:56 -07:00
Mike Place
86f0aa0bb3 Merge pull request #38503 from jinm/issue_38472_jinm 
Hash type fallback for file management
 2017-01-01 10:36:50 -07:00
jinm
0cd9df299f Hash type fallback for file management 
Resolves #38472
 2016-12-30 11:01:51 -05:00
Erik Johnson
ed2ba4bd1b Merge pull request #38457 from bshelton229/git-latest-head-bug 
Stops git.latest checking for local changes in a bare repo
 2016-12-30 08:28:46 -06:00
Daniel Wallace
048b9f6b9d add test 2016-12-29 17:08:24 -06:00
Daniel Wallace
c480c11528 allow spaces in cron env 2016-12-29 17:08:23 -06:00
Daniel Wallace
c529ec8c34 allow crons to have multiple spaces 2016-12-29 17:08:04 -06:00
Daniel Wallace
79368c7528 Use UTC for timing in case timezone changes 
Also make sure start time is in the new timezone.

Fixes #37684
 2016-12-29 14:45:25 -06:00
Mike Place
36e21b22cb Merge pull request #38385 from dragon788/2016.3-double-dash 
Use unambigous long names with double dashes
 2016-12-29 10:10:47 -07:00
Mike Place
59f2560d88 Merge pull request #38474 from cachedout/key_loop 
Allow an existing ioloop to be passed to salt-key
 2016-12-29 09:28:51 -07:00
Mike Place
de504538e1
Allow an existing ioloop to be passed to salt-key 
Fixes #38209
 2016-12-28 16:33:39 -07:00
Bryan Shelton
558e7a771a Stops git.latest checking for local changes in a bare repo 2016-12-28 14:00:21 -08:00
Mike Place
3d0c752acd Merge pull request #38467 from gtmanfred/2016.3 
file.line fail with mode=delete
 2016-12-28 13:00:32 -07:00
Mike Place
86c4b56f47 Newline for lint compat 2016-12-28 12:31:46 -07:00
Daniel Wallace
7b7c6b3878 file.line fail with mode=delete 
If the file is empty, it also fails, fix that.
 2016-12-28 11:51:45 -06:00
Mike Place
940025d5c4 Merge pull request #38434 from slinn0/issue_38433_fixes 
Make sysctl.persist fail when failing to set a value into the running kernel
 2016-12-27 08:37:52 -07:00
Steve Linn
22af87a3fc Fixes for https://github.com/saltstack/salt/issues/38433 
**Summary of Changes**

* Fail in sysctl.persist when we were unable to set a value into memory.

**Testing**

Tested in 2016.3.4 and 2016.11.
 2016-12-24 10:33:47 -08:00
Nicole Thomas
e5eb51255b Update deprecation notices to the correct version (#38421) 
The removal of these code pieces happens in Nitrogen, but they
are marked for deprecation in 2016.3.0.

Refs #38420
 2016-12-22 13:47:21 -07:00
Erik Johnson
9ce53318df file.managed: Fix failure when filename contains unicode chars (#38415) 
Resolves #38282.
 2016-12-22 12:17:40 -07:00
Erik Johnson
2cdb59d055 Merge pull request #38419 from Ch3LL/fix_doc_scsi 
fix scsci docs example
 2016-12-22 12:57:50 -06:00
Ch3LL
234043b8bb fix scsci docs example 2016-12-22 11:32:38 -07:00
Erik Johnson
27253522c8 Improve pillar documentation (#38407) 
* rename anchor

* Move pillar cache config option to different section, add an anchor

* Add links to master and minion config items

* Add documentation for pillar.item's "delimiter" argument

* Improve pillar documentation

This improves RST formatting, adding hyperlinks as well as adding
information on the difference between in-minion pillar data and
pillar data that is compiled on-demand.

* Add section on how pillar environments are handled
 2016-12-22 10:32:37 -07:00
Mike Place
423b1fddff Merge pull request #38398 from terminalmage/issue38372 
Fix call to file.get_managed in cron.file state
 2016-12-22 09:46:12 -07:00
Erik Johnson
c80dbaa914 Fix call to file.get_managed in cron.file state 2016-12-21 17:03:11 -06:00
dragon788
9d9b686057 Address review comments, consistency of quotes 2016-12-21 13:44:56 -06:00
Heewa Barfchin
5a33d1e697 Fix http.query when result has no text (#38382) 2016-12-21 09:07:42 -07:00
Nicole Thomas
b74b5c7d38 Merge pull request #38390 from meaksh/2016.3-fix-try-restart-for-autorestarting-on-SUSE-systems 
Add "try-restart" to fix autorestarting on SUSE systems
 2016-12-21 09:06:23 -07:00
Michael Calmer
de6ec05ec0 add try-restart to fix autorestarting on SUSE systems 2016-12-21 10:31:18 +00:00
dragon788
df9bd5e7f9 Use unambigous long names with double dashes 2016-12-20 18:25:42 -06:00
Mike Place
2c3a39760a Merge pull request #38221 from UtahDave/fix_default_returner 
Fix default returner
 2016-12-20 13:34:35 -07:00
David Boucha
385640765b remove a blank line to satisfy linter 2016-12-20 10:19:44 -07:00
David Boucha
9c248aa14c validate return opt, remove default. 2016-12-19 15:27:49 -07:00
David Boucha
8bb37f9fe7 specify allowed types and default for "returner" 2016-12-19 14:25:10 -07:00
David Boucha
11863a4bfe add examples of default minion returners 2016-12-19 13:47:40 -07:00
David Boucha
e7c6012655 add support for default returners using return 2016-12-19 13:47:40 -07:00
Mike Place
09d9cff992 Merge pull request #38288 from terminalmage/archive-extracted-local-source-2016.3 
archive.extracted: don't try to cache local sources (2016.3 branch)
 2016-12-18 06:07:10 -07:00
Mike Place
bf37667f8a Merge pull request #38312 from cro/proxy_config_in_cfg 
Backport feature allowing proxy config to live in pillar OR /etc/salt/proxy
 2016-12-18 05:39:00 -07:00
Mike Place
c83db5a785 Merge pull request #38320 from rallytime/cleanup-doc-refs 
Cleanup doc internal markup references
 2016-12-18 05:31:27 -07:00
rallytime
62978cb7a0 Don't check the doc/conf.py file for doc markup refs 2016-12-16 13:56:12 -07:00
Mike Ford
6367ca7d2a Add nick to args for create_multi (#38281) 
Added the nick argument to the args provided to create_multi in the
send_msg_multi function
 2016-12-16 13:41:24 -07:00
Erik Johnson
845e3d0e75 Update tests to reflect change in cache behavior 2016-12-16 14:09:48 -06:00
Erik Johnson
5a08d7c70a archive.extracted: don't try to cache local sources (2016.3 branch) 
This will keep us from trying to cache file when we already have it
locally, which will help significantly with larger archives.
 2016-12-16 13:30:59 -06:00
rallytime
770e732d76 Add a unit test to search for new doc markup refs 2016-12-16 11:44:39 -07:00
C. R. Oldham
2006c4000e Typo 2016-12-16 10:29:44 -07:00
Mike Place
235682b1e6 Merge pull request #38313 from dragon788/2016.3-chocolatey-fix 
2016.3 chocolatey fix
 2016-12-16 10:20:39 -07:00
dragon788
1f5fc17551 Use machine readable output for list 
This actually fixes the issue in #38290 while the other change should improve the output for the states.
 2016-12-16 10:10:19 -06:00
dragon788
cdbd2fbe3c Added limit-output to eliminate false packages 
This should fix #38290 and maybe others.
 2016-12-16 10:10:01 -06:00
C. R. Oldham
689d95b10f Backport feature allowing proxy config to live in pillar OR /etc/salt/proxy. 2016-12-16 08:47:58 -07:00