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,414 Commits 24 Branches 182 Tags 341 MiB
85f470207c
Commit Graph

75414 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rallytime
85f470207c Merge branch '2016.3' into '2016.11' 
No conflicts.
 2017-01-03 10:13:06 -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
5e80104a70 Merge pull request #38471 from twangboy/fix_win_service 
Fix Problem with win_service module
 2017-01-01 13:30:20 -07:00
Mike Place
0a09049a2d Merge pull request #38499 from cloudflare/FIX-38485 
Fix #38485
 2017-01-01 10:42:14 -07:00
Mike Place
13f0b809df Merge pull request #38501 from mvdwalle/fix-gogrid-list-password 
Do not assume every object is a server
 2017-01-01 10:37:57 -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
Mark van der Walle
bd7dee9a10 Do not assume every object is a server 2016-12-30 14:22:49 +01:00
Mircea Ulinic
18018139f3
Fix #38485 2016-12-30 11:19:34 +00: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
aa0c843553 Merge pull request #38461 from alprs/fix-kapacitor_changes 
Improvements/fixes to kapacitor task change detection
 2016-12-29 10:08:46 -07:00
Mike Place
2c51eb9d16 Merge pull request #38473 from twangboy/osx_to_macos 
Change OSX/OS X to macOS where possible
 2016-12-29 09:35:10 -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
Andreas Lutro
52721e97d6 clean up and fix tests 2016-12-29 11:14:24 +01:00
Andreas Lutro
8648775c2a if task is not defined, it's not up to date 2016-12-29 11:14:08 +01: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
twangboy
e96bfe8fa2 Change OSX/OS X to macOS where possible 2016-12-28 14:49:46 -07:00
twangboy
810471b9cd Fix problem with some services getting access denied 2016-12-28 13:34:28 -07: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
Mike Place
2497fb547e Merge pull request #38412 from bbinet/pillarstack-updates 
Update PillarStack stack.py to latest upstream version
 2016-12-28 12:28:39 -07:00
Mike Place
5395d3210a Merge pull request #38456 from twangboy/gate_win_utils 
Gate Windows Specific Salt Utils
 2016-12-28 11:44:32 -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
twangboy
d34d110a84 Fix lint, fix boto module 2016-12-28 10:06:40 -07:00
twangboy
c20111142f Gate Windows Utils 2016-12-27 16:56:09 -07:00
Mike Place
7c7799162b Merge pull request #38428 from gqgunhed/fix_lq_typo 
fixed typo: lq command-line syntax
 2016-12-27 08:42:02 -07: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
Mike Place
f5984d0f81 Merge pull request #38444 from lorengordon/issue-38443 
Adds new import required for `extract_hash`
 2016-12-27 08:37:19 -07:00
Andreas Lutro
c3ab954c6e improvements/fixes to kapacitor task change detection 
make sure to check for changes in db/rp/task type as well as the script itself
 2016-12-27 13:05:11 +01:00
Loren Gordon
b2925ad7b7 Adds new import required for extract_hash 
Fixes #38443
 2016-12-26 12:09:47 -05: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
Gunther Stengl
d79d682e8b fixed typo: lq command-line syntax 
At least for Ubuntu's and FreeBSD's version of lq the syntax is:
lq --color-output
 2016-12-23 14:09:38 +01:00
Mike Place
4c4f07ca4c Merge pull request #38167 from cachedout/no_pkg_resources 
Kill pkg_resources for CLI tools [DO NOT MERGE]
 2016-12-22 15:11:21 -07: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
Mike Place
ec6901720a
Remove debugging 2016-12-22 13:04:36 -07:00
Mike Place
f28e33b9b6
Remove from all but salt cli 2016-12-22 12:44:50 -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
Nicole Thomas
2fc8c154af Merge pull request #38417 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2016-12-22 12:00:43 -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
rallytime
efb8a8ddf5 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - doc/ref/configuration/minion.rst
  - salt/config/__init__.py
  - salt/minion.py
 2016-12-22 10:39:14 -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
bbc149c67f Merge pull request #38342 from scthi/bugfix-ext-pillar-nodegroups 
Bugfix ext pillar nodegroups
 2016-12-22 09:47:42 -07:00