valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
61,437 Commits 24 Branches 182 Tags 341 MiB
540305dc99
Commit Graph

61437 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Colton Myers
63ce8f78d5 Merge pull request #28512 from basepi/merge-forward-2015.5 
[2015.5] Merge forward from 2014.7 to 2015.5
 2015-11-02 17:38:08 -07:00
Colton Myers
61c382133a Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 
Conflicts:
    salt/cli/__init__.py
 2015-11-02 16:52:09 -07:00
David Boucha
3cceff9146 Initial commit of dsc module support 
So far this just lists, installs, and removes DSC modules.
There's also a bootstrap function that makes sure the nuget
exe is on the system
 2015-11-02 16:36:48 -07:00
Colton Myers
06cdb50494 Log minion list for all rosters, at debug level 
Logging the minion list at INFO is noisy for every call. It's debug
information. Additionally, we want to log the targets for every roster
type, so move the log higher in the call chain.
 2015-11-02 15:05:36 -07:00
Thayne Harbaugh
2b6e8464fd Add grains/minion_process.py - grains describing the minion process 
* UID
* username
* GID
* groupname
* PID
 2015-11-02 15:03:40 -07:00
Colton Myers
e752502c93 Merge pull request #28450 from moises-silva/redhat-sc-support 
Improve SSH_SH_SHIM code to detect Python from RHSCL
 2015-11-02 15:02:21 -07:00
Mike Place
b919f55f8d Merge pull request #28502 from cachedout/lint_28427 
Lint #28427
 2015-11-02 14:09:20 -07:00
Mike Place
459a342102 Lint #28427 2015-11-02 14:04:31 -07:00
Mike Place
066c1dfcf0 Merge pull request #28445 from sjorge/smartos-grains 
add grains on smartos computenodes
 2015-11-02 13:43:01 -07:00
Mike Place
74b59a08c2 Merge pull request #28393 from jeanpralo/dockercompose-module 
add dockercompose module to manage docker containers via docker-compose
 2015-11-02 13:31:55 -07:00
Colton Myers
238411c8ce Merge pull request #28464 from basepi/merge-forward-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2015-11-02 13:18:21 -07:00
Jean Praloran
1d92b91f9e replace open with salt.utils.fopen 2015-11-03 08:48:44 +13:00
Jean Praloran
f777b36452 add pull and build command 2015-11-03 08:48:44 +13:00
Jean Praloran
3b9f86dcd0 add get method to read the docker-compose.yml in a directory 2015-11-03 08:48:44 +13:00
Jean Praloran
fceb9cbdbf fix examples who could have been misleading 2015-11-03 08:48:43 +13:00
Jean Praloran
8a26d01ce2 comply to salt code style 2015-11-03 08:48:43 +13:00
Jean Praloran
c2afd928d7 fix other typos error, remove kwargs unused 2015-11-03 08:48:43 +13:00
Jean Praloran
78c332bc16 fix typo error 2015-11-03 08:48:43 +13:00
Jean Praloran
a9d2750d2c add documentation, fix some lint errors 2015-11-03 08:48:43 +13:00
Jean Praloran
8b1d4b4593 add dockercompose module to manage docker containers via docker-compose 2015-11-03 08:48:43 +13:00
Colton Myers
6f6e687cb4 Mock master_uri for even tests 2015-11-02 12:15:53 -07:00
Mike Place
da62fdc1e7 Merge pull request #28498 from rominf/postgres-quotes 
[modules/postgres] quote identifiers in SQL
 2015-11-02 12:11:57 -07:00
Jorge Schrauwen
195bdf68ce fix another lint error, missed due to misunderstanding 2015-11-02 18:51:06 +00:00
Mike Place
a25ce38fda Merge pull request #28486 from rallytime/bp-26945 
Back-port #26945 to 2015.8
 2015-11-02 11:43:35 -07:00
Mike Place
0a3e3949ed Merge pull request #28449 from moises-silva/psutil-ubercompat 
Fix AttributeError when trying to access psutil.get_users
 2015-11-02 11:39:25 -07:00
Colton Myers
05a8c39f91 Merge pull request #28437 from bryce-gibson/salt-ssh-tty-salt 
Salt ssh: don't write to stderr when using a tty.
 2015-11-02 10:59:00 -07:00
Mike Place
f3640b3ad6 Merge pull request #28472 from gtmanfred/2015.8 
overwrite more than one value with names
 2015-11-02 10:56:53 -07:00
Mike Place
e31ef51053 Merge pull request #28493 from rallytime/bp-28492 
Back-port #28492 to 2015.8
 2015-11-02 10:54:09 -07:00
Mike Place
38c77206db Merge pull request #28494 from whiteinge/match-filter_by-argfix 
Fix filter_by passing incorrect parameters to match functions
 2015-11-02 10:53:55 -07:00
Roman Inflianskas
0184ecaba7 [modules/postgres] fix tests 2015-11-02 20:53:18 +03:00
Moises Silva
116e787396 Improve SSH_SH_SHIM code to detect Python from RHSCL 
Red Hat Software Collections (RHSCL) installs the python interpreter
in custom locations and then provides a wrapper python script that
sets up some environment variables to be able to run the interpreter
from a different location. In such cases the ssh shim code needs to
also export those variables, otherwise the python interpreter will
fail to execute any code (or even be launched due to missing libraries).

This commit also improves readability for the ssh shim code by adding
indentation to the shim string and then stripping the indentation when
the ssh client module is imported.
 2015-11-02 12:51:28 -05:00
C. R. Oldham
d354885c3d Lint 2015-11-02 10:49:21 -07:00
C. R. Oldham
dbb1f0899e Lint 2015-11-02 10:48:33 -07:00
Mike Place
7c81188f67 Merge pull request #28421 from rominf/service_run 
[modules/service] Add run function to run services with custom arguments
 2015-11-02 10:43:54 -07:00
Mike Place
4972f082bf Merge pull request #28495 from cachedout/mine_opts 
Remove config dup from mine config options
 2015-11-02 10:40:40 -07:00
Mike Place
0c3fdabee8 Merge pull request #28496 from saltstack/revert-28478-postgres-quotes 
Revert "[modules/postgres] quote identifiers in SQL"
 2015-11-02 10:38:06 -07:00
Mike Place
b9761df008 Revert "[modules/postgres] quote identifiers in SQL" 2015-11-02 10:37:56 -07:00
Justin Findlay
e618f51154 Merge pull request #28489 from TheBigBear/patch-1 
Update windows-package-manager.rst (minor edit) adding missing single quote pairs.
 2015-11-02 10:35:48 -07:00
Moises Silva
89b874b994 Fix AttributeError when trying to access psutil.get_users 
Very old versions of psutil do not even have get_users at all.
This commit at least allows using the rest of the functionality
instead of throwing an error right away when importing the psutil
compatibility layer.
 2015-11-02 12:23:22 -05:00
Mike Place
d19affd44d Merge pull request #28491 from rallytime/bp-28388 
Back-port #28388 to 2015.8
 2015-11-02 10:13:22 -07:00
Colton Myers
4bf56cad3f Merge pull request #28461 from cachedout/issue_28455 
Wrap all cache calls in state.sls in correct umask
 2015-11-02 10:11:02 -07:00
Mike Place
f7042ba967 Merge pull request #28465 from twangboy/fix_12363 
Fix #12363: Password Expiration in Windows
 2015-11-02 10:01:18 -07:00
Mike Place
33654c154a Remove config dup from mine config options 
Refs #28467
 2015-11-02 09:51:26 -07:00
Mike Place
50a09d40fd Merge pull request #28467 from jodv/calm_down_mine 
Make mine.update more manageable for large environments
 2015-11-02 09:49:45 -07:00
Mike Place
ec0cbec00b Merge pull request #28485 from eyj/fix_28484 
Fix invalid usage of _get_conn causing #28484
 2015-11-02 09:47:52 -07:00
Seth House
e61ac75d6f Fix filter_by passing incorrect parameters to match functions 2015-11-02 09:32:29 -07:00
Christer Edwards
ffc77259c9 Updated FreeBSD installation docs: 
- fixed URL in description
 - set https in all URLs
 2015-11-02 11:31:23 -05:00
Nicole Thomas
065bb2cd34 Merge pull request #28492 from cedwards/documentation 
Updated FreeBSD installation docs
 2015-11-02 11:29:34 -05:00
Christer Edwards
eb98869e76 Updated FreeBSD installation docs: 
- fixed URL in description
 - set https in all URLs
 2015-11-02 09:26:25 -07:00
Mabsou
954d0c845e Correcting norme error impacted 2015-11-02 17:11:05 +01:00