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
58,296 Commits 24 Branches 182 Tags 341 MiB
c02ec8b943
Commit Graph

58296 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Erik Johnson
75d2b07b0c Pass user in calls to git.rev_parse 2015-10-08 10:44:45 -05:00
Erik Johnson
786786a245 Fix wrong argument name for _git_run() 2015-10-08 10:44:13 -05:00
Colton Myers
bccb74ffc5 Merge pull request #27761 from terminalmage/issue27714 
Merge git pillar data instead of using dict.update()
 2015-10-08 09:00:18 -06:00
Bo Maryniuk
36281f6b06 Bugfix: crash if no package specified on adding a lock 2015-10-08 16:07:05 +02:00
Bo Maryniuk
29806a1af9 Bugfix: crash if no package specified on removing lock 2015-10-08 16:06:50 +02:00
Bo Maryniuk
453a18ea15 Return an actual amount of removed locks. 2015-10-08 16:06:06 +02:00
Bo Maryniuk
eaa6af9898 Bugfix: sometimes error goes to the STDOUT instead of STDERR in the RPM 2015-10-08 15:13:29 +02:00
Eren Güven
ffffede412 better change reporting for postgres_user groups 2015-10-08 15:12:45 +02:00
Bo Maryniuk
350340dafa Bugfix: use boolean type instead of string "Yes" or "No" (NOTE: this was forgotten) 2015-10-08 15:08:32 +02:00
Bo Maryniuk
decb989eb4 Bugfix and refactor due to the crash on unknown package and incorrect return value 2015-10-08 15:02:22 +02:00
Bo Maryniuk
a6c285bd12 Initialization fix 2015-10-08 15:01:20 +02:00
Bo Maryniuk
510dedd29f Bugfix: newer Zypper includes also a version of installed package 2015-10-08 15:00:56 +02:00
Bo Maryniuk
f9bef516de Bugfix: broken "upgrade_available" and should always return dict. 2015-10-08 14:14:35 +02:00
Andreas Lutro
2597d13fc8 update code that changes log level of salt-ssh shim command 
str.`decode("base64")` has been changed to `base64.b64decode`, but the code
that checks for `decode("base64")` has not been changed
 2015-10-08 14:02:25 +02:00
Erik Johnson
2ae7ada3c9 Merge pull request #27741 from ticosax/docker.containers-filters 
[dockerng] pass filters argument to dockerng.ps
 2015-10-07 22:40:14 -05:00
Colton Myers
82a51cebde Merge pull request #27760 from basepi/merge-forward-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2015-10-07 13:11:17 -06:00
Erik Johnson
d149095bb0 Merge git pillar data instead of using dict.update() 
Resolves #27714.
 2015-10-07 13:21:59 -05:00
Colton Myers
35425b14ad Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/man/salt-api.1
    doc/man/salt-call.1
    doc/man/salt-cloud.1
    doc/man/salt-cp.1
    doc/man/salt-key.1
    doc/man/salt-master.1
    doc/man/salt-minion.1
    doc/man/salt-run.1
    doc/man/salt-ssh.1
    doc/man/salt-syndic.1
    doc/man/salt-unity.1
    doc/man/salt.1
    doc/man/salt.7
    salt/modules/pip.py
    salt/states/user.py
 2015-10-07 12:06:12 -06:00
Colton Myers
b2937b6a16 Merge pull request #27759 from basepi/merge-forward-2015.5 
[2015.5] Merge forward from 2014.7 to 2015.5
 2015-10-07 12:01:54 -06:00
Colton Myers
792ee084bb Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 2015-10-07 12:00:53 -06:00
Justin Findlay
aced4229cb Merge pull request #27757 from jfindlay/virtret 
fix virtual fcn return doc indentation
 2015-10-07 11:50:18 -06:00
Justin Findlay
03400ef45b fix virtual fcn return doc indentation 
Fixes #27724.
 2015-10-07 11:49:16 -06:00
Justin Findlay
4b9128b491 Merge pull request #27732 from jacobhammons/26673 
update docs for __virtual__ and __virtualname__
 2015-10-07 11:29:31 -06:00
Nicole Thomas
a130896d1c Merge pull request #27747 from Sacro/fix-chocolatey-version 
Chocolatey doesn't have a help command.
 2015-10-07 10:06:53 -06:00
Nicole Thomas
57b5b594bd Merge pull request #27754 from rallytime/fix-27636 
Change test.nop version directive to 2015.8.1
 2015-10-07 09:59:55 -06:00
Andreas Lutro
4bd219f8d4 add pip_upgrade arg to virtualenv.managed state, clean up docstring 
closes #26904
 2015-10-07 17:59:19 +02:00
rallytime
31b9852d9a Change test.nop version directive to 2015.8.1 
Fixes #27636
 2015-10-07 09:57:01 -06:00
Jonathan Ballet
6d95cbc998 Fix lint errors 2015-10-07 17:49:07 +02:00
Jacob Hammons
75cc07cf10 noted that __virtual__ can return False and an error string 2015-10-07 09:48:46 -06:00
Aditya Kulkarni
cac3da1ffa Fix pylint error 2015-10-07 09:36:08 -04:00
Nicolas Delaby
821ed72f37 pass filters argument to dockerng.ps 2015-10-07 15:06:16 +02:00
Jonathan Ballet
4ff9f4be2a Fix file.directory with clean=true and require_in with states ID 
In order to know which files need to be cleaned up, a file.directory state
looks at its requirements.
Previously, it only looked at the name attribute of the required state and
supposed it was the name of the file to keep within this directory. It's
not completely right, as a requirement can also be made against a state ID,
in which case the 'name' attribute of the required state then have to be
used.

Fix #8646
 2015-10-07 14:53:04 +02:00
Ben Woodward
8f1fa9e78e Chocolatey doesn't have a help command. 2015-10-07 13:44:51 +01:00
Andreas Lutro
ef26f067b2 timezone module: handle timedatectl errors 2015-10-07 13:59:40 +02:00
Jonathan Ballet
0d391275de Test cases to demonstrate bug #8646 2015-10-07 12:06:35 +02:00
rallytime
9df6e106c3 Clean up bootstrap function to be slightly cleaner 2015-10-07 01:12:30 -06:00
jacobhammons
4e48651de0 Merge pull request #27733 from jacobhammons/bug-fixes 
hardening topic - updates to docs.saltstack.com theme
 2015-10-06 19:44:00 -06:00
jacobhammons
9a0171089d Merge pull request #27734 from jacobhammons/theme-updates 
Updated saltstack2 theme to add SaltConf16 banner
 2015-10-06 19:43:53 -06:00
Jacob Hammons
3a52d3606b Updated saltstack2 theme to add SaltConf16 banner 2015-10-06 17:42:53 -06:00
Jacob Hammons
cbecd4f553 Updated saltstack2 theme to add SaltConf16 banner 2015-10-06 17:38:49 -06:00
Jacob Hammons
117e0c2bcc Added hardening topic based on the information in Refs #27088 2015-10-06 17:36:54 -06:00
Jacob Hammons
b928e1afa8 update docs for __virtual__ and __virtualname__ 
Refs #26673
 2015-10-06 17:23:42 -06:00
Nicole Thomas
d3f2dfe835 Merge pull request #27727 from rallytime/merge-27719 
Merge #27719 w/pylint fix
 2015-10-06 15:13:37 -06:00
rallytime
a7fd156162 Pylint 2015-10-06 15:12:27 -06:00
Nicole Thomas
f26bcd2d21 Merge pull request #27724 from jfindlay/virtret 
update __virtual__ return documentation
 2015-10-06 15:06:46 -06:00
Colton Myers
d67e8c5c2c Merge pull request #27725 from basepi/states.cross.call.27481 
Fix global injection for state cross calls
 2015-10-06 15:02:14 -06:00
Colton Myers
e12269d871 Remove unused import 2015-10-06 14:10:55 -06:00
Justin Findlay
6bddf80546 update __virtual__ return documentation 
Related to #26755; fixes #27116; implements part of #27643.
 2015-10-06 13:47:31 -06:00
Colton Myers
4e6505b2e7 Return the wrapper (whoops) 2015-10-06 13:44:55 -06:00
Justin Findlay
6bf2ee2751 tell user when x509 exec/state module can't load 
Fixes #27595.
 2015-10-06 12:46:35 -06:00