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,377 Commits 24 Branches 182 Tags 341 MiB
2497fb547e
Commit Graph

75377 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
f5984d0f81 Merge pull request #38444 from lorengordon/issue-38443 
Adds new import required for `extract_hash`
 2016-12-27 08:37:19 -07:00
Loren Gordon
b2925ad7b7 Adds new import required for extract_hash 
Fixes #38443
 2016-12-26 12:09:47 -05: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
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
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
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
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
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
Bruno Binet
b66b4bd060 Fix lint violations in stack.py 2016-12-22 17:29:45 +01:00
Bruno Binet
6a30fe6aeb Update PillarStack stack.py to latest upstream version 
which provides a fix for issue
https://github.com/bbinet/pillarstack/issues/6
 2016-12-22 15:35:41 +01:00
Thilo Schmalfuss
dba315c4b6
ext-pillar nodegroups works for all minions now. 2016-12-22 11:57:17 +01:00
Erik Johnson
0a72e0f0be git_pillar: Document the transition from env to saltenv in the jinja context 2016-12-21 20:30:06 -06:00
Erik Johnson
c80dbaa914 Fix call to file.get_managed in cron.file state 2016-12-21 17:03:11 -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
Mike Place
12436efb54 Merge pull request #38354 from gmacon/pip-freeze-all 
Use --all when calling pip.py
 2016-12-20 13:40:20 -07:00
Mike Place
68430b1fa6 Merge pull request #38348 from rallytime/mod-docs-2016.11 
Update autodoc topics for new modules added in 2016.11
 2016-12-20 13:36:20 -07:00
Mike Place
6ee7b2bae7 Merge pull request #38377 from DSRCorporation/features/consul_cache 
Implementation and docs for Consul key-value store plugin for minion data cache.
 2016-12-20 13:36:01 -07:00
Mike Place
f6d1b559bc Merge pull request #38373 from rallytime/bp-38212 
Back-port #38212 to 2016.11
 2016-12-20 13:35:09 -07:00
Mike Place
69c3f19fc1 Merge pull request #38374 from cloudflare/FIX-NAPALM-PROXY 
NAPALM proxy module: Fix optional_args key issue
 2016-12-20 13:34:58 -07:00
Mike Place
2c3a39760a Merge pull request #38221 from UtahDave/fix_default_returner 
Fix default returner
 2016-12-20 13:34:35 -07:00
rallytime
b31c2412ca Add __iter__ and next options to doc/conf.py 
This allows sphinx to build without autodoc errors on mock objects
that should be iterable.

Also added versionadded tags to the snapper module and state.
 2016-12-20 11:50:43 -07:00
rallytime
b8c16094c4 Revert "Move import/error messaging logic for snapper module into __virtual__()" 
This reverts commit 640db5b5ac.

This isn't the right approach. We need the "snapper" object throughout the rest
of the module.
 2016-12-20 11:41:57 -07:00
Dmitry Kuzmenko
6fb4430ae3 Configuration options and documentation for Consul data cache plugin. 2016-12-20 21:27:43 +03:00
David Boucha
385640765b remove a blank line to satisfy linter 2016-12-20 10:19:44 -07:00
Stefan Priebe
52fc6daac0 ZMQ: add an option for zmq.BACKLOG to salt master (zmq_backlog) 2016-12-20 09:55:31 -07:00
Mircea Ulinic
44169315d8
Fix optional_args key issue 2016-12-20 16:55:10 +00:00
George Macon
dca24b270e Use --all when calling pip.py 
Fixes #38253.
 2016-12-20 11:48:00 -05:00
Dmitry Kuzmenko
dad748f57a Data cache plugin configuration documentation. 2016-12-20 19:32:48 +03:00
Dmitry Kuzmenko
c7209cd90c Consul data cache plugin. 2016-12-20 19:32:37 +03:00
Mike Place
530f495955 Merge pull request #38073 from doublescoring/2016.11 
2016.11
 2016-12-20 07:51:10 -07:00
Mike Place
67908d5aba Merge pull request #38344 from bbinet/fix-influx-createdb 
Fix influxdb_database.present state
 2016-12-20 06:57:45 -07:00
Nicole Thomas
04d6898958 Merge pull request #38358 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2016-12-19 17:11:47 -07:00
David Boucha
9c248aa14c validate return opt, remove default. 2016-12-19 15:27:49 -07:00
rallytime
c6e191ad0d Remove doc markup references from 2016.11 branch 2016-12-19 15:14:37 -07:00
rallytime
513058945c Merge branch '2016.3' into '2016.11' 
Conflicts:
  - doc/ref/states/requisites.rst
  - doc/topics/cloud/profitbricks.rst
  - doc/topics/cloud/vsphere.rst
  - doc/topics/releases/0.9.8.rst
  - doc/topics/releases/releasecandidate.rst
  - salt/cloud/clouds/vsphere.py
  - salt/minion.py
  - salt/states/archive.py
  - tests/unit/states/archive_test.py
 2016-12-19 14:58:39 -07:00
Erik Johnson
79231a5d8a archive.extracted: don't try to cache local sources (#38285) 
* archive.extracted: don't try to cache local sources

This will keep us from trying to cache file when we already have it
locally, which will help significantly with larger archives.

* Update tests to reflect change in cache behavior

* Add mock return for /bin/tar

This fixes failing tests for Ubuntu 14
 2016-12-19 14:37:58 -07:00
David Boucha
8bb37f9fe7 specify allowed types and default for "returner" 2016-12-19 14:25:10 -07:00
Erik Johnson
13414949e3 Merge pull request #37947 from vutny/fix-rhel5-minion-init 
Fix `salt-minion` initscript for RHEL5 (SysV) to pick up proper python version
 2016-12-19 15:03:49 -06:00
David Boucha
11863a4bfe add examples of default minion returners 2016-12-19 13:47:40 -07:00