valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
69,458 Commits 24 Branches 182 Tags 341 MiB
1c001d0ee1
Commit Graph

69458 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
1c001d0ee1 Merge pull request #36622 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-09-28 14:39:43 +09:00
Mike Place
e7def534b1 Merge pull request #36520 from twangboy/fix_cmd.script_runas 
Fix cmd.script runas for Windows
 2016-09-28 13:07:00 +09:00
rallytime
90c66ef756 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/modules/aptpkg.py
  - salt/states/service.py
 2016-09-27 21:34:10 -06:00
Mike Place
798bf3086b Merge pull request #36564 from DSRCorporation/bugs/32368_grains_match_bug 
Improve and fix `_check_cache_minions`
 2016-09-28 11:50:54 +09:00
Mike Place
133705d567 Merge pull request #36606 from danlsgiga/consul_pillar_token 
Add support for ACL Tokens in consul_pillar with the option consul.token
 2016-09-28 11:46:03 +09:00
Mike Place
9b9e167b47 Merge pull request #36562 from kiorky/s2015.8 
Fix pkg.latest_version using localized output
 2016-09-28 11:43:38 +09:00
Mike Place
4ab52ae0f6 Merge pull request #36607 from vutny/detect-service-fail 
`salt.states.service`: detect that service failed to start/stop
 2016-09-28 11:39:51 +09:00
Mike Place
5de036b56c Merge pull request #36611 from multani/2015.8 
jinja: fix YAML terminator removal in Jinja's "yaml" filter
 2016-09-28 11:36:21 +09:00
Mike Place
b365f1e34d Merge pull request #36613 from slinn0/2016.3_36588_fixes 
Remove file.check_managed_changes  when not needed (backport of PR #36589 to 2016.3)
 2016-09-28 11:35:56 +09:00
Dmitry
be61f97db3 Minor: syntax error fixes. 2016-09-28 00:23:46 +03:00
Dmitry Kuzmenko
29660ed672 Improve and fix _check_cache_minions 
Don't match minion if it's not in the output list.
Don't check the minion existence in the list where we know it's there.
Simplify the code (as for me...)
 2016-09-27 23:28:15 +03:00
Nicole Thomas
e23af98d97 Merge pull request #36609 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-09-27 12:34:22 -06:00
Jonathan Ballet
79fdc12395 jinja: fix YAML terminator removal in Jinja's "yaml" filter 2016-09-27 18:52:49 +02:00
elainearbaugh
6e36191fc4 Fix trust key 2015.8 (#36540) 
* Fix gpg.trust_key user bug

* Separated user and no user case
 2016-09-27 10:28:28 -06:00
rallytime
f15d4a38bd Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/states/pkg.py
 2016-09-27 10:15:16 -06:00
Steve Linn
d9da5cb2d4 Backport of PR #36589 / Issue #36588 to 2016.3 branch. 2016-09-27 08:43:21 -07:00
Denys Havrysh
c4f899b3b3 salt.states.service: detect that service failed to start/stop 2016-09-27 18:24:37 +03:00
Daniel Santos
a5907c9c89 Add support for ACL Tokens in consul_pillar with the option consul.token 2016-09-27 09:05:52 -06:00
Mike Place
25fa754d94 Merge pull request #36595 from cachedout/issue_7754_fix 
Remove tests which no longer apply
 2016-09-27 16:38:15 +09:00
Mike Place
3a83b0bd16
Remove tests which no longer apply 
The point of these tests originally was to verify the proper location
of a log file. Checking return codes is just spurious and ties the test
too closely with the shutdown behavior of the daemons which are tracked and tested
in other places more closely and with more accuracy.
 2016-09-27 16:36:24 +09:00
Mike Place
aed98f47de Merge pull request #36594 from cachedout/issue_36586 
Update boostrap docs to recent versions of Ubuntu
 2016-09-27 15:18:49 +09:00
Mike Place
1e6a60ab01
Update boostrap docs to recent versions of Ubuntu 
Closes #36586
 2016-09-27 15:17:58 +09:00
Mike Place
c79f525863 Merge pull request #36585 from twangboy/add_pyopenssl 
Add pyOpenSSL to req file for Windows
 2016-09-27 14:49:42 +09:00
Erik Johnson
57ec792f6b Merge pull request #36550 from rickyninja/2015.8 
Add version_cmp for FreeBSD pkg.
 2016-09-26 20:45:57 -05:00
twangboy
377ced5c24 Remove directory in Windows with runas 2016-09-26 18:03:21 -06:00
twangboy
5fc63a1054 Add pyOpenSSL to req file for Windows 2016-09-26 17:35:28 -06:00
Mike Place
f205d5f870 Fix salt.utils.rm_rf to delete files too (#36572) 
Closes #36568
 2016-09-26 09:50:41 -06:00
Mike Place
d0dd92b037 Merge pull request #36495 from cro/zypper_fix 
Fix pkg.upgrade for zypper
 2016-09-26 19:02:39 +09:00
Mike Place
4bca246a27 Merge pull request #36539 from jfindlay/arch_perms 
Prefer archive.cmd_unzip
 2016-09-26 19:02:11 +09:00
Mike Place
ab50cde391 Merge pull request #36546 from rallytime/fix-36514 
Mercurial Module: Pass the identity_path portion as own arg
 2016-09-26 18:44:30 +09:00
Mike Place
aea55fce61 Merge pull request #36555 from DSRCorporation/bugs/35480_master_shutdown 
Bugs/35480 master shutdown
 2016-09-26 18:25:43 +09:00
Jeremy Singletary
f9ef30aabe Add version_cmp for FreeBSD pkg. 2016-09-26 00:58:49 -07:00
Mathieu Le Marec - Pasquet
47c3d03035 Fix pkg.latest_version using localized output 
This fixes #36561.
 2016-09-25 10:01:33 +00:00
Dmitry Kuzmenko
6ad2998715 Wait for kill in ProcessManager should be greater in main process than in subprocess. 
Or it would kill subprocess before it killed his children.
 2016-09-24 17:10:56 +03:00
Dmitry Kuzmenko
c9c45a5d79 Don't set the daemon flag for LoggingQueue process. 
Because the ProcessManager already manages the LoggingQueue lifecycle.
 2016-09-24 15:50:53 +03:00
rallytime
9afe76759e Mercurial Module: Pass the identity_path portion as own arg 
Fixes #36514
 2016-09-23 16:50:06 -06:00
Nicole Thomas
a1e0afe1c7 Merge pull request #36542 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-09-23 16:47:26 -06:00
rallytime
861a001749 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-09-23 15:06:28 -06:00
Nicole Thomas
07c9d040c0 Fixup the rabbitmq_user state test failure (#36541) 2016-09-23 15:05:40 -06:00
Nicole Thomas
5548ed771d Back-port #36435 to 2016.3 (#36532) 
* Added "none" option for pillar_source_merging_strategy

* added none to merging strategy in dictupdate so we no longer log warnings when it is selected

* Updated documentation

* fix for when pillar_source_merging_strategy is not set

* Fix looking up pillar data when merging is set to "none" and no saltenv was passed

* Fix looking up pillar data when merging is set to "none" and no saltenv was passed retry

* Let's not break when no merging strategy is passed

* Capitalisation

* Update on doc
 2016-09-23 13:36:23 -06:00
Nicole Thomas
fe377b3da0 Be explicit about the salt.utils.templates import (#36535) 2016-09-23 13:35:58 -06:00
Nicole Thomas
fcc50c93fc Wrap the entire GrainsAppendTestCase class with destructiveTest (#36537) 
Since all pieces of the GrainsAppendTestCase are destructive, let's
just wrap the whole class test case.

Because the tests themselves as well as the `tearDown` function were
wrapped in a @destructiveTest decorator, some test errors were printing
in the test output when --run-destructive isn't passed at the CLI.

This fixes those test errors.
 2016-09-23 13:35:05 -06:00
Justin Findlay
d64ae48783 states.archive: use archive.cmd_unzip when possible 
cmd_unzip is preferable as python's zip module does not preserve
permissions or mtimes.  See https://bugs.python.org/issue15795.
 2016-09-23 12:59:01 -06:00
Justin Findlay
928a7891b4 modules.archive.unzip: log a warning about perms 
See https://bugs.python.org/issue15795.
 2016-09-23 12:58:26 -06:00
Nicole Thomas
55cf4d6a04 Merge pull request #36529 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-09-23 10:42:42 -06:00
rallytime
52cf40db8c Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-09-23 08:32:47 -06:00
Mike Place
03491634ff Merge pull request #36483 from dmurphy18/aix_fix_ipv6 
Isolate sun IPv6 fix to Sun OS only
 2016-09-23 18:24:54 +09:00
Mike Place
1c3758544c Merge pull request #36441 from twangboy/update_setup 
Check for existing libraries on Windows
 2016-09-23 18:20:58 +09:00
Mike Place
654fa8d770 Merge pull request #36280 from jwplayer/feature/2016.3-better-postgresql-grants 
Feature/2016.3 better postgresql grants
 2016-09-23 16:55:32 +09:00
Mike Place
8104d5c92a Merge pull request #36508 from twangboy/fix_chocolatey 
Fix chocolatey
 2016-09-23 16:36:03 +09:00