Thomas S Hatch
0a88254cee
Merge pull request #18441 from techhat/vsphere
...
Enforce libs check in __virtual__()
2014-11-24 14:13:14 -07:00
Joseph Hall
dbe7e64193
Copyedit
2014-11-24 13:51:39 -07:00
Joseph Hall
7f3f784072
Enforce libs check in __virtual__()
2014-11-24 13:47:35 -07:00
Thomas S Hatch
01535e398f
Merge pull request #18427 from billcchung/develop
...
Fix issue #18308
2014-11-24 11:54:51 -07:00
Thomas S Hatch
7dd722c448
Merge pull request #18420 from terminalmage/issue18369
...
Add autoremove function to aptpkg.py
2014-11-24 11:54:16 -07:00
Thomas S Hatch
bc3e49be75
Merge pull request #18417 from cachedout/consoldate_defaults
...
Create defaults dir and move exitcodes module there.
2014-11-24 11:52:07 -07:00
Thomas S Hatch
59398dc4e1
Merge pull request #18415 from cachedout/progress_bar
...
Progress bar
2014-11-24 11:51:30 -07:00
Thomas S Hatch
8ae5c59a20
Merge pull request #18414 from sebest/develop
...
fixing some documentation in boto_* states
2014-11-24 11:47:02 -07:00
Thomas S Hatch
2f5e5dcd4e
Merge pull request #18410 from tjyang/develop
...
Note about a oneliner check on pysphere python module
2014-11-24 11:44:48 -07:00
Thomas S Hatch
e77b371692
Merge pull request #18405 from tbaschak/nagios-pillar-example
...
Nagios module pillar docs ex update
2014-11-24 11:43:39 -07:00
Thomas S Hatch
41ef2354cf
Merge pull request #18402 from bjmllr/runit-service-module
...
add runit service module
2014-11-24 11:43:17 -07:00
Thomas S Hatch
28184587d7
Merge pull request #18437 from thatch45/rallytime-mine_log_warning
...
Merge #18396
2014-11-24 11:38:12 -07:00
Thomas S Hatch
a1ffee71c4
Fix to use warn_until
2014-11-24 11:32:05 -07:00
Thomas S Hatch
08343790d4
Merge branch 'mine_log_warning' of https://github.com/rallytime/salt into rallytime-mine_log_warning
2014-11-24 11:29:51 -07:00
Thomas S Hatch
330771940f
Merge pull request #18394 from s0undt3ch/hotfix/merge-forward
...
Merge branch '2014.7' forward into develop
2014-11-24 11:23:07 -07:00
bill chung
54ed9512b2
Fix issue #18308 by adding a retry mechanism in validate_windows_cred function
2014-11-24 17:14:20 +08:00
Erik Johnson
db664f040b
Ignore retcode when checking for autoremove packages
2014-11-23 10:17:34 -06:00
Erik Johnson
afde9096c4
Add autoremove function to aptpkg.py
...
Resolves #18369 .
2014-11-23 09:57:19 -06:00
T.J. Yang
26d28f40d2
Merge remote branch 'upstream/develop' into develop
2014-11-22 16:45:13 -08:00
Joseph Hall
2db74b1545
Merge pull request #18416 from cachedout/remove_travis_from_hacking
...
No need for info on travis in HACKING doc
2014-11-22 16:52:53 -07:00
Mike Place
b2eb00aef7
Create defaults dir and move exitcodes module there.
2014-11-22 14:20:21 -07:00
Mike Place
8640af91c3
List number of expected returns
2014-11-22 13:59:02 -07:00
Sebastien Estienne
d0ad5cf547
add more informations in boto_elb errors messages
2014-11-22 12:43:54 -08:00
Mike Place
2c6f6d402d
No need for info on travis in HACKING doc
2014-11-22 13:31:43 -07:00
Mike Place
2fd8852ab0
Warn cleanly if outputter not available
2014-11-22 13:11:09 -07:00
Mike Place
7351cb31a6
Pull iter out of raw mod
2014-11-22 13:06:47 -07:00
Sebastien Estienne
d017a77744
fixing some documentation in boto_* states
2014-11-22 12:04:55 -08:00
Mike Place
6a2c2e1974
Allow type of module to be returned from raw_mod
2014-11-22 12:59:07 -07:00
Mike Place
d69771c72d
Simplify returns. Only update progress rets.
2014-11-22 11:53:19 -07:00
Mike Place
78a2c1687c
Added virtual
2014-11-22 11:12:33 -07:00
T.J. Yang
242be3ddb9
makefile update at Sat Nov 22 08:15:23 CST 2014
2014-11-22 08:15:23 -06:00
Pedro Algarvio
ee210172c3
Add missing =
2014-11-22 12:17:42 +00:00
Pedro Algarvio
a285683d8e
Merge pull request #18384 from techhat/awsutil
...
Switch ec2 driver to signature version 4
2014-11-22 12:16:07 +00:00
Theo Baschak
81fcbabdc6
Nagios module pillar docs ex update
...
When copy/pasting the example nagios check Pillar shown in the
[online](http://docs.saltstack.com/en/latest/ref/modules/all/salt.module
s.nagios.html) and sys.doc documentation the load check doesn't run. By
adding the spaces the check is then run. It seems like there should
always be a space to avoid this from happening.
2014-11-22 00:00:27 -06:00
Seth House
f2a691a5ac
Merge pull request #18398 from tjyang/develop
...
correct the TOC missing issue
2014-11-21 22:55:49 -07:00
Joseph Hall
ce5d49b374
Merge pull request #18388 from hulu/returner-shadowing
...
avoid shadowing in returners.multi_returner
2014-11-21 19:40:06 -07:00
Joseph Hall
9e94072d25
Merge pull request #18399 from hulu/routes-shadowing
...
avoid shadowing in salt.modules.network
2014-11-21 19:39:28 -07:00
Pedro Algarvio
0b946ba32b
Merge branch '2014.7' into hotfix/merge-forward
2014-11-22 02:17:10 +00:00
Pedro Algarvio
6e0f4da593
Fix syntax errors
2014-11-22 02:16:26 +00:00
Pedro Algarvio
360949c0e0
Merge pull request #18392 from thatch45/listen_fix
...
Check for listen data struct validity
2014-11-22 02:01:13 +00:00
Ben Miller
407fe00871
add runit service module
2014-11-21 20:26:18 -05:00
Chris Rebert
98a02b032d
avoid shadowing in salt.modules.network
2014-11-21 16:57:43 -08:00
Joseph Hall
fe407e9167
Linting
2014-11-21 17:21:28 -07:00
Joseph Hall
240c8f2eac
Merge pull request #18389 from rallytime/fix_unused_arg
...
Fix unused args in modules/cloud.py
2014-11-21 17:16:46 -07:00
Thomas S Hatch
60a1483bfd
Merge pull request #18377 from thatch45/usr_fix
...
Use the sdecode routine
2014-11-21 17:16:34 -07:00
Joseph Hall
9a38c515cd
Merge pull request #18385 from rallytime/cloud_events_doc
...
Add information about salt-cloud events to master events doc
2014-11-21 17:11:57 -07:00
rallytime
d6450f46cb
Add warning about using --out in runners/mine.py
...
Fixes #18390
2014-11-21 17:01:03 -07:00
Mike Place
6ba28b4df2
Initial sketch of CLI progress
2014-11-21 16:55:43 -07:00
Pedro Algarvio
50bb9c3867
Merge branch '2014.7' into hotfix/merge-forward
...
Conflicts:
salt/fileclient.py
2014-11-21 23:39:28 +00:00
Pedro Algarvio
49e38788cd
Merge pull request #18393 from s0undt3ch/2014.7
...
Use requests instead of github package. Also output the PR incoming branch
2014-11-21 23:37:13 +00:00