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
Matthew Williams
b1d7c69228
add lxc runner
2014-01-29 22:04:02 -05:00
Erik Johnson
245f28e99a
Merge pull request #10043 from dangarthwaite/scheduler-doc-state-args-kwargs
...
The code or schedule had a better example than the doc.
2014-01-29 18:39:28 -08:00
Konstantin Antselovich
bcf51c9367
fix parsing in monit module
...
- do not process empty lines
- make sure data is there.
2014-01-29 19:36:29 -07:00
Samuel M Smith
203436abcc
Because of integer conversion get_event has a minimum wait time of 1.0 second even if 0.0 < wait < 1.0
...
This is a problem for ioflo and halite in terms of tuning how fast events are pulled down when there are not
very many events happening otherwise on the master.
2014-01-29 18:53:07 -07:00
Peter Baumgartner
1bdfb0f6a5
Linting
2014-01-29 15:07:45 -07:00
Peter Baumgartner
1fb99d9985
Linting
2014-01-29 15:06:08 -07:00
Peter Baumgartner
e04f6c7b9b
Fixes tests
2014-01-29 15:03:17 -07:00
Peter Baumgartner
ae993bd013
Fixes tests
2014-01-29 15:02:50 -07:00
Peter Baumgartner
f04a7d5056
Cleanup
2014-01-29 14:45:06 -07:00
Peter Baumgartner
d7fa363673
Adds uWSGI stats module
2014-01-29 14:40:23 -07:00
Peter Baumgartner
1ac2f67350
Use Salt conventions
2014-01-29 14:23:58 -07:00
Peter Baumgartner
9b61d0e6ab
Adds info on status module
2014-01-29 14:23:42 -07:00
Joseph Hall
85cbec910e
Merge pull request #10033 from gravyboat/develop
...
Updated file_roots doc to show an example using multiple environments.
2014-01-29 13:22:31 -08:00
Peter Baumgartner
4c515558cf
Adds Nginx status module
2014-01-29 14:17:43 -07:00
Forrest Alvarez
c1d8fca8a5
Fixed a typo in the file_roots docs,
2014-01-29 20:52:08 +00:00
Forrest Alvarez
ff4a01d5ed
Updated the file_roots docs to show an example using multiple file roots for different environments.
2014-01-29 20:51:03 +00:00
Daniel Bradshaw
869f980b45
Restore MagicMock as it shouldn't cause any issues.
2014-01-29 18:46:44 +00:00
Daniel Bradshaw
bc967fa3fb
Expand tests for manage_mode
2014-01-29 18:46:44 +00:00
Daniel Bradshaw
43f179b481
Normalize stats()['mode'] for safety.
2014-01-29 18:46:44 +00:00
Daniel Bradshaw
23eb6996e7
Use a string version of the mode.
2014-01-29 18:46:44 +00:00
Daniel Bradshaw
261e0f5814
Revert 'int comparison rather than string comparison of octal values; zero padding on one but not the other caused spurious mismatch'
2014-01-29 18:46:28 +00:00
Daniel Bradshaw
ff957abac2
Revert 'Coerced several values to string representations of octal where before they
...
were sometimes strings and sometimes ints.'
2014-01-29 18:46:28 +00:00
Daniel Bradshaw
51a73cbda1
Revert "I realized that the coercion to oct string I was doing was incorrect."
...
This reverts commit 8cd50a92ea
2014-01-29 18:46:27 +00:00
Daniel Bradshaw
cb46e11afa
Ensure a leading zero on the string.
2014-01-29 18:46:27 +00:00
Thomas S Hatch
10304c296b
Fix lint per #10020
2014-01-29 08:59:35 -07:00
Thomas S Hatch
2106775c6e
Merge pull request #10020 from felskrone/added_minions_denied_to_pki
...
denied minions keys are written to $pki_dir/minions_denied
2014-01-29 07:57:50 -08:00
Thomas S Hatch
ae16ed9c58
Merge pull request #10019 from galet/file-extract-hash-tests
...
Added test for salt.modules.file.extract_hash() to verify support for simple Maven checksum file format
2014-01-29 07:50:15 -08:00
Thomas S Hatch
b88291bb70
Merge pull request #10014 from sabaini/develop
...
cobbler ext_pillar params should be a dict
2014-01-29 07:47:53 -08:00
Thomas S Hatch
6604bfffc8
Merge pull request #10013 from bretep/develop
...
Add ability to subfilter in sls files
2014-01-29 07:46:22 -08:00
Thomas S Hatch
94a6b01522
Merge pull request #10011 from makinacorpus/fix10010
...
display full jinja traceback when applicable
2014-01-29 07:41:29 -08:00
Thomas S Hatch
759db9d08f
Merge pull request #10009 from bigkraig/defaults-fix
...
Fixing defaults.py for 2014.1rc3
2014-01-29 07:40:35 -08:00
Thomas S Hatch
2693b4d1e6
Merge pull request #10008 from mgwilliams/runner-docs
...
make "salt-run -d" limit to the specific runner or function, if provided
2014-01-29 07:38:48 -08:00
Thomas S Hatch
61464e31a3
Merge pull request #10001 from mgwilliams/virt
...
virt runner: delete key from master when VM is purged
2014-01-29 07:34:01 -08:00
Thomas S Hatch
3b1a45985b
Merge pull request #9999 from cachedout/catch_bad_args
...
Catch bad args in salt-call
2014-01-29 07:33:41 -08:00
Thomas S Hatch
e46e655b2b
Merge pull request #9994 from terminalmage/issue9903
...
Fix ref to changed parameter name in file.stats
2014-01-29 07:33:09 -08:00
Thomas S Hatch
ec963d2dd9
Merge pull request #9989 from regilero/develop
...
Doc: fix grains.filter_by example on default argument usage
2014-01-29 07:29:50 -08:00
Thomas S Hatch
cd84a159f0
Merge pull request #9988 from makinacorpus/handleerror
...
Handle better state errors
2014-01-29 07:29:11 -08:00
