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
Daniel Hobley
b75e059138
Fixed installation of packages via macports on OS X
...
- append/extend on arrays return None and therefore None was being passed to run_all
- compare_dicts function was called incorrectly
2014-11-22 14:50:32 +01: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
Daniel Hobley
7b67c45699
Filter out IPv6 localhost on OS X
2014-11-22 10:52:39 +01: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
Pedro Algarvio
74e23b9e26
And also the base branch of the incoming PR's branch
2014-11-21 23:35:37 +00:00
Pedro Algarvio
672e98cf0f
Use requests instead of github package. Also output the PR incoming branch.
2014-11-21 23:33:29 +00:00
Thomas S Hatch
00b2848b0f
Add data structure check to listen flag
2014-11-21 16:27:34 -07:00
Thomas S Hatch
648cf261c1
Merge pull request #18381 from cvrebert/patch-1
...
fix typo in utils.parsers.OptionParser.parse_args
2014-11-21 16:16:28 -07:00
Thomas S Hatch
7d20891c16
try with string cast
2014-11-21 16:15:31 -07:00
Thomas S Hatch
864ad4b3a2
Merge pull request #18378 from rallytime/bp-18079
...
Backport #18105 to 2014.7
2014-11-21 16:13:57 -07:00
Thomas S Hatch
681fe94b65
Merge pull request #18375 from rallytime/remove_unused_arg
...
Remove 'repo' argument as it isn't used by function
2014-11-21 16:13:07 -07:00
Thomas S Hatch
0b4c8b9ab2
Merge pull request #18363 from jacksontj/2014.7
...
Fix for #8670
2014-11-21 16:12:52 -07:00
T.J. Yang
5f3cf20ffc
makefile update at Fri Nov 21 17:12:48 CST 2014
2014-11-21 17:12:48 -06:00
rallytime
dd47871f0a
Fix unused args in modules/cloud.py
...
Fixes #18387
2014-11-21 16:12:43 -07:00
Thomas S Hatch
f7b9ad4533
Merge pull request #18351 from lyft/grains-and-pillar-reloads
...
Add reload_grains and reload_pillar global state arguments
2014-11-21 16:11:54 -07:00
Chris Rebert
7e696a7885
avoid shadowing in returners.multi_returner
2014-11-21 15:11:09 -08:00
Thomas S Hatch
a679d71128
Only run if it is a string, change in develop for six compat
2014-11-21 16:08:43 -07:00
Thomas S Hatch
644f69eb75
Merge pull request #18343 from thatch45/requests_crazy
...
Fix #18131
2014-11-21 16:04:00 -07:00
Thomas S Hatch
1b68371494
Merge pull request #18376 from thatch45/18361
...
Add sdecode for highstate
2014-11-21 16:03:35 -07:00
Thomas S Hatch
27b4d83892
Merge branch '2014.7' into develop
...
Conflicts:
salt/utils/__init__.py
2014-11-21 16:02:05 -07:00
Thomas S Hatch
c858e4391f
Merge pull request #18365 from jacksontj/2014.7-config
...
Better output on requisite failure
2014-11-21 16:00:53 -07:00
Thomas S Hatch
b74b140d99
Merge pull request #18386 from thatch45/lint865
...
lint fix
2014-11-21 15:59:55 -07:00
