valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
58,982 Commits 24 Branches 182 Tags 341 MiB
6747400e1c
Commit Graph

58982 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
0109bf889e Merge pull request #27095 from l2ol33rt/redis_engine_import_fix 
Redis engine import fix
 2015-09-14 11:46:47 -06:00
Pedro Algarvio
eb982b464e Initialization cleanup 2015-09-14 18:44:44 +01:00
Mike Place
e489c4f877 Merge pull request #27058 from papoyan/add-zenoss-prod-state 
added module and state to handle prodState in zenoss
 2015-09-14 11:36:24 -06:00
Mike Place
860de8d877 Merge pull request #27050 from twangboy/fix_minion_conf 
Turned multiprocessing on
 2015-09-14 11:34:18 -06:00
Mike Place
247a4b063d Merge pull request #27077 from SaltyCharles/add-osx-build-version-to-grains 
add os build version grain to OS X minions
 2015-09-14 11:33:30 -06:00
Mike Place
aa85b16a8f Merge pull request #27096 from whiteinge/doc-mine-master-side 
Add note about retrieving Mine data from Pillar & Orchestrate
 2015-09-14 11:32:22 -06:00
Mike Place
fbbec3bb85 Absolute import to satisfy Py3 compat 2015-09-14 11:27:05 -06:00
Brad Thurber
5d4798012a more test updates 2015-09-14 13:05:07 -04:00
Pedro Algarvio
d380a0a286 Fix getting the right attributes from the loader 2015-09-14 18:03:13 +01:00
Pedro Algarvio
88eed12615 Make Pylint happier 2015-09-14 17:58:29 +01:00
Pedro Algarvio
f27bc74298 Factor out pkgdb and pkgfiles initialization. 
Add helper functions to call pkgdb and pkfiles functions
 2015-09-14 17:56:19 +01:00
Pedro Algarvio
b4980911f4 Indent comment 2015-09-14 17:55:44 +01:00
Pedro Algarvio
fcb7138efa Make sure spm tests are picked up by runtests. 
Lists in py2 don't have the clear method
 2015-09-14 17:54:51 +01:00
Mike Place
c58190d67e Merge pull request #27091 from perfinion/chdir-fix 
salt/master: chdir to root not homedir
 2015-09-14 10:46:50 -06:00
Alejandro del Castillo
dce3b89a6c Add beacon to monitor network settings 
This beacon uses pyroute2.

Signed-off-by: Alejandro del Castillo <alejandro.delcastillo@ni.com>
 2015-09-14 11:21:18 -05:00
Mike Place
12f40a78a1 Merge pull request #27008 from cachedout/issue_26276 
Don't stacktrace on schedule channel send
 2015-09-14 10:15:47 -06:00
Thayne Harbaugh
31878fb038 Fix access to `ret` parameter (reverts 54b33dd359 #24732) 
The attempt to fix ``_print_returns_summary()`` in 54b33dd359 missed that
there were two callers of ``_print_returns_summary()`` with differing data
structure in the ``ret`` parameter.  While 54b33dd359 fixed the results for
one caller it broke it for the other.  Commits 2de88e6 and 7c9f4ca fix the
consistency of the ``ret`` parameter for callers and now 54b33dd359 needs to
be reverted.
 2015-09-14 10:14:57 -06:00
Papoyan, Nerses
f17270376c aded versionadded 2015-09-14 11:06:29 -05:00
Papoyan, Nerses
df41b5fc44 added whitespace after : 2015-09-14 11:03:14 -05:00
Papoyan, Nerses
701deef5fc added prod_state to the example 2015-09-14 11:02:53 -05:00
Brad Thurber
872aabf7fa update more tests 2015-09-14 11:55:42 -04:00
Steve Weber
f451712e78 keepalive mode using process exit codes 
keepalive mode using process exit codes
 2015-09-14 11:32:51 -04:00
Brad Thurber
b1ceb221a0 more test updates. It wouldn't surprise me if these changes expose other failing tests. 2015-09-14 10:36:40 -04:00
Brad Thurber
72235f61ce clean up lint and add profile to tests 2015-09-14 09:03:30 -04:00
Seth House
cf93acd6af Add note about retrieving Mine data from Pillar & Orchestrate 
Closes #11509
 2015-09-13 14:10:12 -06:00
Robert James Hernandez
684df9c8bd Clean up import and virtual 2015-09-13 11:37:31 -07:00
Robert James Hernandez
2747693daa Remove double redis import 2015-09-13 10:49:56 -07:00
Justin Findlay
daaf57a63c Merge pull request #27083 from TheBigBear/patch-7 
minor edit - conform to other comments
 2015-09-13 00:14:39 -06:00
C. R. Oldham
c78d833540 Merge pull request #27086 from techhat/spmdevdocs 
Document develoment of SPM loader modules
 2015-09-12 22:52:55 -06:00
Jason Zaman
74818856a3 salt/master: chdir to root not homedir 
The pre-flight checks try to change to $HOME, this can fail for multiple
reasons. One such case is that /root is a protected dir under SELinux
which the master should not have access to. The daemon should instead
change to the root dir which is the only dir that is always guaranteed
to be there. The limited testing I have managed to do shows that windows
accepts the '/' path too just fine so the os-specific case is not
required either.
 2015-09-13 12:45:38 +08:00
rallytime
fb94c2daa7 Code Cleanup of user.py 
Collapse if statements
 2015-09-12 15:57:32 -06:00
Joseph Hall
ee0c8955dd Document develoment of SPM loader modules 2015-09-12 11:14:47 -06:00
Nicole Thomas
fb4d21b65a Merge pull request #27084 from rallytime/merge-26893 
Merge #26893 with Pylint Fixes
 2015-09-12 11:13:57 -06:00
Nicole Thomas
25b11759f9 Merge pull request #26941 from msteed/issue-23125 
Make elasticsearch work as master job cache
 2015-09-12 11:13:44 -06:00
rallytime
dd5c0e13ee Collapse if statements in gpg module 
Code Qube!
 2015-09-12 11:08:54 -06:00
Michael Steed
ff88fe402c add versionadded info to save_load() & get_load() 2015-09-12 10:37:59 -06:00
rallytime
9b68aed13e Merge #26893 with pylint fixes 2015-09-12 10:15:55 -06:00
Joseph Hall
b763d0ba52 Merge pull request #27080 from bechtoldt/spm_doc 
[Proposal] Add Github SPM label for issues
 2015-09-12 08:32:58 -06:00
TheBigBear
71a2952b26 Update win_update.py 2015-09-12 14:25:12 +01:00
TheBigBear
2a554b3ef6 minor edit - conform to other comments 
minor edit to make it look like other comments here
```
     Comment: Search was done with out an error.
              Download was done without error.
              Install was done without error.
```
 2015-09-12 14:21:54 +01:00
Arnold Bechtoldt
b9e5095bf5 add GH issue label SPM to docs 2015-09-12 11:14:26 +02:00
SaltyCharles
e51c53a08b add os build version grain to OS X minions 2015-09-11 15:55:49 -07:00
Justin Findlay
cf59a03432 Merge pull request #27064 from twangboy/user_docs 
Fixed user docs
 2015-09-11 16:37:19 -06:00
Justin Findlay
71c12cbf46 Merge pull request #27072 from rallytime/bp-26840 
Back-port #26840 to 2015.8
 2015-09-11 16:35:52 -06:00
Joseph Hall
9704222e70 Merge pull request #27069 from rallytime/salt-cloud-key-gen 
Generate keys in salt.utils.cloud.bootstrap if they're not already there
 2015-09-11 16:03:55 -06:00
Theodore Cowan
d0b9ececa4 Update http.py 
fix for https://github.com/saltstack/salt/issues/21917
 2015-09-11 15:46:11 -06:00
rallytime
9e51eabf16 Switch Rackspace driver to use salt.utils.cloud.bootstrap() 2015-09-11 15:15:39 -06:00
rallytime
d6a50f76eb Don't create keys in cli.py for salt-cloud 2015-09-11 14:23:19 -06:00
Papoyan, Nerses
e3175dd7b1 added docstring for find_device function 2015-09-11 15:07:26 -05:00
rallytime
c5754360d4 Generate keys in salt.utils.cloud.bootstrap if they're not already there 2015-09-11 14:04:40 -06:00