valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-06 16:45:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
75,329 Commits 24 Branches 182 Tags 341 MiB
dad748f57a
Commit Graph

75329 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Mike Place
4d072ca689 Merge pull request #38106 from techhat/stateget 
"test" is not necessarily in opts, for thorium
 2016-12-19 07:40:31 -07:00
Bruno Binet
c6b075d6f4 Fix influxdb_database.present state 
make use of influxdb.create_db instead of influxdb.db_create which does
not exist
 2016-12-19 15:13:44 +01:00
Mike Place
a01fade604 Merge pull request #38333 from amendlik/states-alternatives 
Suppress errors when checking if an alternative exists
 2016-12-19 06:40:48 -07:00
Mike Place
15d3b476e9 Merge pull request #38340 from ewapptus/bp-38251 
Backport PR #38251: Fixed nested orchestrate not respecting failures
 2016-12-19 06:31:14 -07:00
Elias Wulcan
266e0a465c Fixed nested orchestrate not respecting failures 
Client was only setting success to false if the function called raised
an exception. This commit changes it to verify the content of return
value with check_state_result
 2016-12-19 10:29:05 +01:00
Adam Mendlik
8bfcd5bcd5 Adjust alternatives test for updated error message 2016-12-18 10:04:24 -07:00
Mike Place
ecd441d090 Merge pull request #38229 from mcalmer/dockerng-sls_build-kwargs 
provide kwargs of sls_build to dockerng.create
 2016-12-18 06:13:09 -07:00
Mike Place
09d9cff992 Merge pull request #38288 from terminalmage/archive-extracted-local-source-2016.3 
archive.extracted: don't try to cache local sources (2016.3 branch)
 2016-12-18 06:07:10 -07:00
Mike Place
d2ce9c3e71 Merge pull request #38309 from ewapptus/bp-37333 
Backport PR #37333: Fixed state.salt.runner() reporting success on exceptions
 2016-12-18 05:39:52 -07:00
Mike Place
bf37667f8a Merge pull request #38312 from cro/proxy_config_in_cfg 
Backport feature allowing proxy config to live in pillar OR /etc/salt/proxy
 2016-12-18 05:39:00 -07:00
Mike Place
c83db5a785 Merge pull request #38320 from rallytime/cleanup-doc-refs 
Cleanup doc internal markup references
 2016-12-18 05:31:27 -07:00
Mike Place
ebb9f6cbbc Merge pull request #38323 from rallytime/update-cloud-provider-links 
Update the Cloud Provider Specifics links in cloud docs
 2016-12-18 05:30:48 -07:00
Mike Place
5bd7471e30 Merge pull request #38324 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2016-12-18 05:30:25 -07:00
Mike Place
83523d2f73 Merge pull request #38325 from rallytime/bp-38247 
Back-port #38247 to 2016.11
 2016-12-18 05:28:40 -07:00
Mike Place
54a2bb95de Merge pull request #38326 from yopito/fix-runit-init-support 
fix runit init support (grain init) in 2016.11
 2016-12-18 05:07:24 -07:00
Adam Mendlik
09dee3c611 Suppress errors when checking if an alternative exists 2016-12-17 11:30:02 -07:00
Alkivi
4b6c5438e3 fix(win_functions): syntax 2016-12-16 15:26:58 -07:00
Alkivi
e602f17e3d fix(win_function): handle other language 2016-12-16 15:26:58 -07:00
rallytime
5940db5b3f Merge branch '2016.3' into '2016.11' 
No conflict.
 2016-12-16 15:25:08 -07:00
yopito
25b91bb686 fix detection of runit as init system (grain init) 2016-12-16 23:23:50 +01:00
rallytime
022caf23e9 Update the Cloud Provider Specifics links in cloud docs 
- Reordered some to be alphabetical
- Added Azure Arm
- Added Dimension Data
 2016-12-16 15:19:45 -07:00
Nicole Thomas
9e35f5dd08 Add azurearm module to doc index (#38322) 2016-12-16 14:44:20 -07:00
rallytime
62978cb7a0 Don't check the doc/conf.py file for doc markup refs 2016-12-16 13:56:12 -07:00
Mike Ford
6367ca7d2a Add nick to args for create_multi (#38281) 
Added the nick argument to the args provided to create_multi in the
send_msg_multi function
 2016-12-16 13:41:24 -07:00
Erik Johnson
845e3d0e75 Update tests to reflect change in cache behavior 2016-12-16 14:09:48 -06:00
Erik Johnson
5a08d7c70a archive.extracted: don't try to cache local sources (2016.3 branch) 
This will keep us from trying to cache file when we already have it
locally, which will help significantly with larger archives.
 2016-12-16 13:30:59 -06:00
rallytime
770e732d76 Add a unit test to search for new doc markup refs 2016-12-16 11:44:39 -07:00
Mike Place
1e4f299e7d Merge pull request #38305 from dereckson/fix-mode-extraneous-normalization 
Avoid normalization call for normalized mode value
 2016-12-16 10:31:25 -07:00
C. R. Oldham
2006c4000e Typo 2016-12-16 10:29:44 -07:00
Mike Place
235682b1e6 Merge pull request #38313 from dragon788/2016.3-chocolatey-fix 
2016.3 chocolatey fix
 2016-12-16 10:20:39 -07:00
Erik Johnson
05e423a78f Improve documentation for archive.extracted in 2016.11 (#38291) 
This adds some information to the archive.extracted docstring to better
explain some of the changes made for 2016.11.0.

It also makes a small tweak to the archive.is_encrypted function
docstring.
 2016-12-16 09:13:28 -07:00
dragon788
1f5fc17551 Use machine readable output for list 
This actually fixes the issue in #38290 while the other change should improve the output for the states.
 2016-12-16 10:10:19 -06:00
dragon788
cdbd2fbe3c Added limit-output to eliminate false packages 
This should fix #38290 and maybe others.
 2016-12-16 10:10:01 -06:00
C. R. Oldham
689d95b10f Backport feature allowing proxy config to live in pillar OR /etc/salt/proxy. 2016-12-16 08:47:58 -07:00
Nicole Thomas
3cf0135d50 Merge pull request #38298 from rallytime/bp-37967 
Back-port #37967 to 2016.11
 2016-12-16 08:20:04 -07:00
benediktwerner
a2b1259671 Fixed display of errors 2016-12-16 15:25:40 +01:00
Benedikt Werner
14a39f914e Fixed state.salt.runner return value on exceptions 2016-12-16 15:25:40 +01:00
Sébastien Santoro
573ac3565e Avoid normalization call for normalized mode value 2016-12-16 12:39:34 +00:00
Alexey Aksenov
42d3d26f28 [38073] Fix test assertion 2016-12-16 13:37:50 +03:00
Alexey Aksenov
9b37ead913 Fix broken os.write without string.encode 
Fixes #38048
 2016-12-16 13:33:59 +03:00
Michael Calmer
e7292fabb7 make it explicit that we want to delete these keys 2016-12-16 09:40:58 +01:00