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
70,288 Commits 24 Branches 182 Tags 341 MiB
fd2ee7db30
Commit Graph

70288 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rallytime
fd2ee7db30 Add some simple unit tests for salt.config.api_config function 
This will help prevent regressions in this area as discussed in
PR #38527.
 2017-01-09 16:44:48 -07:00
rallytime
3d2fefc83b Make sure the pidfile and log_file values are overriden by api opts 2017-01-09 16:09:03 -07:00
rallytime
1f6b540e46 Make sure the pidfile and log_file values are overriden by api opts 2017-01-05 10:22:05 -05:00
Robin Björklin
04d307f917 salt-api no longer forces the default timeout 
Conflicts:
  - salt/config/__init__.py
 2017-01-05 10:19:56 -05:00
Mike Place
7b74436d13 Merge pull request #38562 from rallytime/arch-install-docs 
Update arch installation docs with correct package name
 2017-01-04 13:04:27 -07:00
Mike Place
01860702cb Merge pull request #38560 from Ch3LL/fix_api_log 
fix api logfile
 2017-01-04 12:03:17 -07:00
rallytime
8b1897ace9 Update arch installation docs with correct package name 
When 2016.11.0 was released, the naming of the salt package was
changed. The salt-zmq version is now named just "salt" and the
salt-raet pacakge is no longer being updated.
 2017-01-04 13:08:47 -05:00
Ch3LL
1b45e9670b fix api logfile 2017-01-04 10:55:13 -07:00
Mike Place
0056620a53 Merge pull request #38531 from rallytime/bp-33601 
Back-port #33601 to 2016.3
 2017-01-04 09:56:52 -07:00
Mike Place
50242c7f17 Merge pull request #38541 from techhat/issue38187 
Strip user:pass from cached URLs
 2017-01-04 08:39:56 -07:00
Mike Place
325dc56e59 Merge pull request #38554 from multani/fix/30454 
Fix YAML deserialization of unicode
 2017-01-04 08:31:16 -07:00
David Boucha
4ddbc2ecaa add note about pyVmomi locale workaround (#38536) 2017-01-04 09:24:04 -05:00
Megan Wilhite
1c951d152b fix gce image bug (#38542) 2017-01-04 09:08:04 -05:00
Jonathan Ballet
2e7f743371 yaml: support unicode serialization/deserialization 
Fix: #30454
 2017-01-04 13:29:28 +01:00
Jonathan Ballet
df76113c5c jinja: test the "yaml" filter with ordered dicts 2017-01-04 13:29:28 +01:00
Jonathan Ballet
f7712d417f Revert "Add yaml_safe filter" 
This reverts commit 2405ff11b5.

This never worked:

* yaml_txt is stripped and never ends with a '\n'
* len(string - 5) doesn't work
* yaml.safe_dump() doesn't allow to set a custom Dumper() (see
  10c55a6244/lib/yaml/__init__.py (__init__.py-212) )

Also, #36611 for related bug and fix.
 2017-01-04 13:29:28 +01:00
Joseph Hall
eae3a435dd Strip user:pass from cached URLs 2017-01-03 13:28:37 -07:00
Christian McHugh
c36cb39825 remove the unnecessary double trigger 2017-01-03 10:51:30 -05:00
Christian McHugh
38414493bf fix spacing lint error 2017-01-03 10:51:30 -05:00
Christian McHugh
8c1defc710 Remove uncessary type from alias commands. 
Deduplicate alias handling to autodetect function selection.
Add error reporting to slack connectivty problems.
Cleanup slack's unicode conversion
 2017-01-03 10:51:30 -05:00
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