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
77,059 Commits 24 Branches 182 Tags 341 MiB
0a769d5989
Commit Graph

77059 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sevag Hanssian
727194b2a0 Add strict flag to ini.options_present 2016-12-27 11:50:10 -05:00
Mike Place
5cba84cce2 Merge pull request #38400 from gtmanfred/cloud_cache 
Allow use of globs with cloud cache roster
 2016-12-27 09:31:08 -07:00
Mike Place
acedf3e95b Merge pull request #38413 from eradman/map_docs 
Provide an example for overriding nested parameters in a map file
 2016-12-27 09:24:17 -07:00
Mike Place
53331b4915 Merge pull request #38418 from sc250024/feature/UpdateEC2InstanceSizes 
Update of EC2 instance sizes
 2016-12-27 09:10:57 -07:00
Mike Place
34621930aa Merge pull request #38420 from rallytime/module-deprecations 
Removed various deprecation notices from salt/modules/* files
 2016-12-27 09:09:58 -07:00
Mike Place
2c6035d479 Merge pull request #38423 from terminalmage/pillar-docs 
Add pillarenv_from_saltenv to pillar docs
 2016-12-27 08:46:25 -07:00
Mike Place
1e9bb19c9a Remove trailing whitespace 2016-12-27 08:43:07 -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
34e664ed3b Remove trailing whitespace for lint check 2016-12-27 08:39:59 -07:00
Mike Place
feb072f032 Merge pull request #38431 from nsmoot/postgres-control-flow 
Fix os_family control flow in postgres module
 2016-12-27 08:38:40 -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
Mike Place
f6d67030e3 Merge pull request #38447 from donkko/fix-typo 
Fix typo in grafana4.py
 2016-12-27 08:36:43 -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
donkko
cbf4d07bb2 Fix typo in grafana4.py 2016-12-27 14:08:09 +09:00
Christian McHugh
4a0b8e76f3 replace expr_form with tgt_type for nitrogen 2016-12-26 18:21:40 +00:00
Loren Gordon
b2925ad7b7 Adds new import required for extract_hash 
Fixes #38443
 2016-12-26 12:09:47 -05:00
Erik Johnson
591b9ed9c4 Add pillarenv_from_saltenv to example minion config file 2016-12-25 11:36:40 -06: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
Nathan Smoot
f7f1fea4be Fix os_family control flow in postgres module 2016-12-24 00:14:52 -05:00
Herbert Buurman
b4113df880 modules/selinux.py: fcontext_get_policy: Only validate filetype if given. 2016-12-23 16:53:02 +01: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
Herbert Buurman
a0fd6c0ac8 modules/selinux.py: fcontext_policy_is_applied: Fixed missing recursive argument. fcontext_apply_policy: Changed changes-list to parse multiple changed files. 2016-12-23 12:46:17 +01:00
Herbert Buurman
8a8cf15d8b states/selinux.py: Only return changes when they were succesfully applied 2016-12-23 12:43:43 +01:00
Christian McHugh
3f4cd6be54 Add example usage 2016-12-23 11:42:21 +00:00
Christian McHugh
36429c8a46 remove extra space 2016-12-23 11:39:32 +00:00
Christian McHugh
1cfb430190 allow messages to pass in expr_form for better targeting 2016-12-23 11:34:31 +00:00
Herbert Buurman
3f61b6b17f states/selinux.py: Fixed some forgotten renames to sel_type. Fixed missing recursive argument passthrough. 2016-12-23 12:20:12 +01:00
Erik Johnson
4cbfa9d947 Add pillarenv_from_saltenv to pillar docs 2016-12-22 16:25:29 -06: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
Nicole Thomas
8c70cc9ab6 Merge pull request #38422 from rallytime/merge-develop 
[develop] Merge forward from 2016.11 to develop
 2016-12-22 13:46:47 -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
rallytime
a2927226ea Merge branch '2016.11' into 'develop' 
Conflicts:
  - doc/ref/modules/all/salt.modules.napalm_route.rst
  - doc/ref/modules/all/salt.modules.napalm_snmp.rst
  - doc/ref/modules/all/salt.modules.napalm_users.rst
  - doc/ref/states/all/salt.states.netsnmp.rst
  - doc/ref/states/all/salt.states.netusers.rst
  - salt/states/cron.py
 2016-12-22 12:15:06 -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
rallytime
0a27f941f7 Removed various deprecation notices from salt/modules/* files 
Added docs to the release notes for all of these changes.

The affected modules are:

- htpasswd
- img
- smartos_virt
- virt
- virtualenc_mod
- xapi
- zypper
 2016-12-22 11:57:26 -07:00
Ch3LL
234043b8bb fix scsci docs example 2016-12-22 11:32:38 -07:00
Scott Crooks
f73eb2982b Update of EC2 instance sizes per documentation at 
http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/instance-types.html
 2016-12-22 10:00:06 -08:00
Erik Johnson
7bf4ab8f95 Revert "call sdecode for the filename in file.managed()" (#38416) 
This reverts commit 619e4b5b1e.
 2016-12-22 10:56:21 -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
Mike Place
16f35244f8 Merge pull request #38378 from rallytime/git-deprecations 
Remove functions and arguments in git state and execution module
 2016-12-22 09:47:10 -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
Mike Place
87d30a25d8 Merge pull request #38397 from skizunov/develop2 
Let IOLoop run other tasks between connection attempts
 2016-12-22 09:39:28 -07:00
Mike Place
fb8b5d2d46 Merge pull request #38399 from skizunov/develop3 
Fix exception when `event.fire_master` used without connection
 2016-12-22 09:36:27 -07:00
Mike Place
453476d982 Merge pull request #38403 from terminalmage/document-saltenv 
git_pillar: Document the transition from env to saltenv in the jinja context
 2016-12-22 09:34:47 -07:00