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,211 Commits 24 Branches 182 Tags 341 MiB
a41b59bf6e
Commit Graph

58211 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
a41b59bf6e Merge pull request #27833 from jfindlay/path_decode 
decode path before string ops in fileclient
 2015-10-12 09:26:39 -06:00
Mike Place
e264db7702 Merge pull request #27837 from jfindlay/true_shell 
reverse truth in python_shell documentation
 2015-10-12 09:25:13 -06:00
Mike Place
faec838744 Merge pull request #27860 from flavio/fix-os-grains-on-suse-and-opensuse 
Fix OS related grains on openSUSE and SUSE Linux Enterprise
 2015-10-12 09:22:59 -06:00
Mike Place
4ac5344c31 Merge pull request #27768 from rallytime/cleanup_bootstrap 
Clean up bootstrap function to be slightly cleaner
 2015-10-12 09:06:54 -06:00
Mike Place
e1bd91e392 Merge pull request #27797 from isbm/isbm-zypper-fixes 
Zypper module clusterfix
 2015-10-12 09:06:02 -06:00
Flavio Castelli
fc8d296d72 Fix OS related grains on openSUSE and SUSE Linux Enterprise 
Starting from openSUSE 13 and SUSE Linux Enterprise 12 the file
`/etc/os-release` is part of these distributions. Future releases are
also going to drop `/etc/SuSE-release`.

The presence of `/etc/os-release` prevents the execution of the code
parsing `/etc/SuSE-release`, leading to missing/wrong grains.

Without this code on a SLE12 SP1 machine salt would produce these
grains:
  * osrelease: 12
  * oselease_info: [12]
  * oscodename: x86_64

With this commit the following new grains are set:
  * lsb_distrib_codename: SUSE Linux Enterprise Server 12 SP1
  * lsb_distrib_release: 12.1

Moreover the following grains are properly set:
  * osrelease: 12.1
  * oselease_info: [12, 1]
  * os_codename: SUSE Linux Enterprise Server 12 SP1

Signed-off-by: Flavio Castelli <fcastelli@suse.com>
 2015-10-12 11:15:06 +02:00
Joseph Hall
286b08a0f5 Merge pull request #27849 from rallytime/fix-27821 
Don't require a size parameter for proxmox profiles
 2015-10-10 19:33:28 -06:00
rallytime
1bf17c7d48 Don't require a size parameter for proxmox profiles 
Fixes #27821
 2015-10-10 16:45:51 -06:00
Justin Findlay
1c9708a457 reverse truth in python_shell documentation 
Fixes #27804.
 2015-10-09 14:48:50 -06:00
Justin Findlay
66c74e591e decode path before string ops in fileclient 
Fixes #27789.
 2015-10-09 13:04:02 -06:00
Colton Myers
4a69db27cd Merge pull request #27827 from techhat/spmfixes 
Add additional error checking to SPM
 2015-10-09 12:23:09 -06:00
Joseph Hall
ffc8df223b Add additional error checking to SPM 2015-10-09 10:28:08 -06:00
Seth House
9bc19ba7d2 Merge pull request #27826 from martinhoefling/fix-27825 
Fixes #27825
 2015-10-09 10:08:05 -06:00
Pedro Algarvio
1e2dede122 Merge pull request #27824 from techhat/azureerrors 
Update Azure errors
 2015-10-09 16:25:14 +01:00
Martin Hoefling
401e7de33d Fixes #27825 2015-10-09 17:24:49 +02:00
Joseph Hall
5b23ac7099 Update Azure errors 2015-10-09 08:44:10 -06:00
Nicole Thomas
ec35666ff2 Merge pull request #27795 from eguven/2015.8-postgres_user-group-change 
better change reporting for postgres_user groups
 2015-10-08 17:56:53 -06:00
Nicole Thomas
5420006209 Merge pull request #27799 from terminalmage/issue27703 
Fix usage of identity file in git.latest
 2015-10-08 17:36:19 -06:00
C. R. Oldham
0533a2b1dd Merge pull request #27717 from pass-by-value/proxy_beacon_example 
Proxy beacon example
 2015-10-08 16:58:49 -06:00
Colton Myers
dd9dba8f59 Merge pull request #27793 from alprs/fix-salt_ssh_b64_log 
update code that changes log level of salt-ssh shim command
 2015-10-08 13:20:12 -06:00
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
rallytime
31b9852d9a Change test.nop version directive to 2015.8.1 
Fixes #27636
 2015-10-07 09:57:01 -06: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
Ben Woodward
8f1fa9e78e Chocolatey doesn't have a help command. 2015-10-07 13:44:51 +01:00