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
75,399 Commits 24 Branches 182 Tags 341 MiB
53449c89a5
Commit Graph

75399 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
53449c89a5 Merge pull request #38549 from meaksh/2016.11-snapper-multiple-subvolumen-support 
Adding multiple SUBVOLUME support and some fixes to the Snapper module
 2017-01-04 08:32:29 -07:00
Nicole Thomas
d43beab738 Move boto_vpc.describe_route_table deprecation version to Oxygen (#38545) 
Deprecations need 2 feature releases before we can remove them.

This deprecation notice appeared first in 2016.11, so we need to
allow a little more time to adapt to the change.
 2017-01-04 09:13:28 -05:00
Pablo Suárez Hernández
ef26e93bb7 Some fixes and pylint 2017-01-04 11:51:22 +00:00
Pablo Suárez Hernández
1e6ba45db4 Fixes pre/post snapshot order to get the inverse status 2017-01-04 09:00:20 +00:00
Pablo Suárez Hernández
68d5475c1f Fixing Snapper unit tests for SUBVOLUME support 2017-01-04 08:59:51 +00:00
Pablo Suárez Hernández
e9919a913f Removing posible double '/' from the file paths 2017-01-04 08:59:51 +00:00
Pablo Suárez Hernández
8b4f87f226 Updating and fixing the documentation 2017-01-04 08:59:50 +00:00
Pablo Suárez Hernández
edea45272a Raises "CommandExecutionError" if snapper command fails 2017-01-04 08:59:50 +00:00
Pablo Suárez Hernández
3841e1143b Only include diff in the state response if include_diff is True 2017-01-04 08:59:48 +00:00
Pablo Suárez Hernández
7803e7716c Adds multiple SUBVOLUME support to the Snapper module 2017-01-02 16:11:52 +00: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
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
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
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
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
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
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
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