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
25,428 Commits 24 Branches 182 Tags 341 MiB
e1fa6955ff
Commit Graph

25428 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Frank Klaassen
62721e0c3e Merge remote-tracking branch 'upstream/develop' into develop 2014-01-31 13:12:09 +01:00
Matthew Williams
9f7d86d341 salt-run: colorize and strip rst when printing docs 2014-01-31 06:07:39 -05:00
Peter Baumgartner
7084a0f7a2 Derp. Thanks Jenkins! 2014-01-30 18:15:23 -07:00
Peter Baumgartner
f39471eff7 Fixes KeyError in scheduler 
The old code resulted in a KeyError if self.schedule_returner was
defined, but data['returner'] was not. This happened when mine.update is
triggered and you have schedule_returner defined in the pillar.
 2014-01-30 18:03:48 -07:00
Joseph Hall
6710ca1605 Merge pull request #10050 from jeremyfelt/fix-file_root 
s/environmentt/environment/ in new file_roots.rst documentation
 2014-01-30 17:03:43 -08:00
Pedro Algarvio
210749bdbe Merge pull request #10073 from cvrebert/patch-3 
win_service mod: rm unused import of `time`
 2014-01-30 16:58:30 -08:00
Joseph Hall
79125277a9 Merge pull request #10074 from hulu/nginx-shadowing 
modules.nginx.status(): rename local var to avoid shadowing
 2014-01-30 16:07:12 -08:00
Erik Johnson
ee832bf880 Allow pygit2 gitfs_provider to use git shas as envs 
This extends this feature (added for gitpython at last night's sprint)
to pygit2.
 2014-01-30 16:49:28 -07:00
Erik Johnson
abc774e24c Allow gitpython gitfs_provider to use git shas as envs 
This only works so far for the fileclient, it will not work in the top
file. Additional work needs to be done to enable sha envs to be found by
the top file.
 2014-01-30 16:49:28 -07:00
Chris Rebert
8aaa806e5b modules.nginx.status(): rename local var to avoid shadowing 
************* Module salt.modules.nginx
salt/modules/nginx.py:113: [W0621(redefined-outer-name), status] Redefining name 'status' from outer scope (line 98)
 2014-01-30 14:33:41 -08:00
Chris Rebert
09e24b81c3 win_service mod: rm unused import of time 
salt/modules/win_service.py:7: [W0611(unused-import), ] Unused import time
 2014-01-30 14:31:16 -08:00
Chris Rebert
3c3de44340 modules.config.manage_mode: rm unnecessary parens 2014-01-30 14:28:40 -08:00
Chris Rebert
aa900f3661 client/ssh/wrapper/config.py: rm unnecessary parens 2014-01-30 14:26:10 -08:00
Frank Klaassen
2f7d1f9a7e Group mem/cpu output of ps.top 2014-01-30 20:37:11 +01:00
Erik Johnson
7c5e6015ba Merge pull request #10057 from mgwilliams/lxc 
add docs for lxc runner
 2014-01-30 11:18:22 -08:00
Nahum Shalman
7b9712c2d2 SmartOS Esky build: Just try to grab everything 
After discovering missing modules one at a time I went in search
of a bigger hammer.

We use the bbfreeze ModuleGraph code to find all deps for
salt.modules.* and add them to the FREEZER_INCLUDES variable.

It may be worth trying this approach for other platforms...
 2014-01-30 14:06:19 -05:00
Matthew Williams
490338850a add lxc runner to index.rxt 2014-01-30 14:03:15 -05:00
Seth House
b9e9912d63 Added a rST anchor for the Reactor docs 2014-01-30 11:49:38 -07:00
Joseph Hall
63b84ac6d9 Merge pull request #10065 from gravyboat/develop 
Updated the hacking doc to add a note about jenkins, and trash the travis-ci note.
 2014-01-30 10:39:23 -08:00
Forrest Alvarez
c70343bb03 Updated the hacking doc to fix the jenkins url so it was a hyperlink. 2014-01-30 18:29:31 +00:00
Forrest Alvarez
fcf3112c27 Updated the hacking doc to remove the note about travis-ci, and instead add a note explaining the jenkins process. 2014-01-30 18:25:24 +00:00
Michael Birtwell
20ec134780 Fix usage of logging pylint errors 2014-01-30 17:21:04 +00:00
Michael Birtwell
c2d8afc82a Fix pylint errors and delete commented code 2014-01-30 17:10:21 +00:00
Michael Birtwell
f3b71e79c7 Use only one poller in salt-minion + add logging 
Using only one poller in salt-minion means that the salt-minion
interleaves handling of execution requests and events.
 2014-01-30 16:22:30 +00:00
Joseph Hall
8a53c925ea Merge pull request #10056 from kadel/doc-state-cmd-small-fixes 
docs: indentation fix and missing id declaration
 2014-01-30 07:08:18 -08:00
Tomas Kral
49f206b94c docs: indentation fix and missing id declaration 2014-01-30 14:23:34 +01:00
Pedro Algarvio
82ef052314 Merge pull request #10051 from s0undt3ch/develop 
Double to single quotes, minor lint space issue.
 2014-01-29 22:28:23 -08:00
Erik Johnson
900a615b9e Merge pull request #10052 from jacksontj/develop 
Now that we've consolidated the yumpkgmodules we don't need to have this
 2014-01-29 22:17:31 -08:00
Thomas Jackson
0221a9738a More cleanup 2014-01-30 01:06:05 -05:00
Thomas Jackson
7f80e5f0e9 Now that we've consolidated the yumpkgmodules we don't need to have this comment 2014-01-30 01:04:24 -05:00
Pedro Algarvio
daf94a58b7 Remove trailing white-space. 2014-01-29 22:48:48 -07:00
Pedro Algarvio
9f54dcb3da Double to single quotes, minor lint space issue. 2014-01-29 22:41:57 -07:00
Matthew Williams
df3c875d5a add docs for lxc runner 2014-01-30 00:19:21 -05:00
jeremyfelt
1562acfbb3 s/environmentt/environment/ in new documentation 
Introduced in 85cbec9
 2014-01-29 20:40:02 -08:00
Justin Carmony
a9d35df87c Saltfile feature initial parsers work 2014-01-29 21:39:56 -07:00
David Lindquist
a3ceed03c8 Formatting change 2014-01-29 20:19:43 -08:00
David Lindquist
c3c04afdaf Test a case where the loader auth doesn't have the auth type 2014-01-29 20:19:43 -08:00
David Lindquist
46a0f5b637 Add __main__ to test 2014-01-29 20:19:42 -08:00
Thomas S Hatch
99db66e2c7 Merge pull request #10045 from mgwilliams/lxc 
add lxc runner
 2014-01-29 19:47:58 -08:00
Seth House
e3867e0612 Merge pull request #10047 from gravyboat/develop 
Updated the formulas doc to show an example that reflects our normal map structure.
 2014-01-29 19:37:39 -08:00
Thomas S Hatch
0a5396fa1a Fix lint 2014-01-29 20:35:49 -07:00
Thomas S Hatch
6a9982aed9 Merge pull request #10044 from kantselovich/issue-10041 
fix parsing in monit module
 2014-01-29 19:34:53 -08:00
Forrest Alvarez
49bdaf7498 Updated the formulas doc to show an example that reflects our normal map structure. 2014-01-30 03:34:20 +00:00
Thomas S Hatch
600ea4acb9 lint fix 2014-01-29 20:33:43 -07:00
Thomas S Hatch
e7bb7f1bfa Merge pull request #10040 from SmithSamuelM/sam_fix_wait_get_event 
Because of integer conversion get_event has a minimum wait time of  1.0 .second even if 0.0 < wait < 1.0
 2014-01-29 19:32:59 -08:00
Thomas S Hatch
6d5babfa5c whitespace 2014-01-29 20:30:26 -07:00
Thomas S Hatch
a1561ec7e3 Merge pull request #10037 from ipmb/features/nginx_status 
Adds Nginx status module
 2014-01-29 19:29:08 -08:00
Thomas S Hatch
2253feeb41 Merge pull request #10038 from ipmb/features/uwsgi_stats 
Adds uWSGI stats module
 2014-01-29 19:28:56 -08:00
Thomas S Hatch
13e0d53493 Merge pull request #10029 from kaithar/feature/fix-special-bit-perm-test 
Better handling for special bit modes
 2014-01-29 19:20:31 -08:00
Matthew Williams
e4fd949708 lxc runner: lint 2014-01-29 22:17:34 -05:00