Commit Graph

43432 Commits

Author SHA1 Message Date
Nitin Madhok
ead0c5184b Adding ability to do a test run with test=True. #18966 2014-12-16 05:02:37 -05:00
Thomas S Hatch
7c471ef13f Merge pull request #18990 from toanju/patch-1
debian vlan configuration
2014-12-15 12:20:30 -07:00
Thomas S Hatch
403f1404e4 Merge pull request #18956 from thatch45/merge_forward_8798
Merge forward 2014.7
2014-12-15 10:38:36 -07:00
Thomas S Hatch
59f8a2bbe7 Merge pull request #18993 from rasathus/develop
Logs exceptions while caching for s3fs fileserver. Messages such as 'Acc...
2014-12-15 10:27:20 -07:00
Thomas S Hatch
2ec2ec6e1b Merge pull request #18974 from garethgreenaway/gpg_module_hardcoded_path
Fixes to gpg module
2014-12-15 10:09:51 -07:00
Thomas S Hatch
9e8f498431 Merge pull request #18964 from DSRCompany/raet_presence
Presence support with raet
2014-12-15 09:45:38 -07:00
Gareth J. Greenaway
397b471f8e removing duplication assignment. Syncing up the path with the gpg renderer. 2014-12-15 07:55:56 -08:00
Nicole Thomas
2decd9de47 Merge pull request #18954 from rupeshta/at_unit_tests
created unit test case for function atq from module at
2014-12-15 08:55:18 -07:00
Chris Fane
7be9ac7bf5 Logs exceptions while caching for s3fs fileserver. Messages such as 'AccessDenied' will now be logged as at warning level. fixes #18992 2014-12-15 15:05:07 +00:00
Rupesh Tare
54bb776f9e Merge branch 'develop' into at_unit_tests 2014-12-15 17:29:54 +05:30
Rupesh Tare
fbafd6fb51 added unit test case for atrm & jobcheck functions from at module 2014-12-15 17:28:58 +05:30
Tobias Jungel
f9cb8883cb debian vlan configuration
Debian based systems depend on the package 'vlan' to enable a VLAN interface
2014-12-15 10:05:45 +01:00
Dmitry Kuzmenko
4e91495075 Minor: fixed formatting 2014-12-15 10:27:06 +03:00
Dmitry Kuzmenko
5b48d3a38d Support subset and show_ipv4 flags in presence runners
Use availables as a base for present results
Send host address together with the host name in presence responce
Support subset and show_ipv4 flags in presence runners
Fixed not_present subset:
  Old: include alive minions not included into subset to resutls
  New: show only not-alive minions specified in the subset
Moved key directory names to a static fields to key classes. So fixed
some wrong cases in raet key behavior like using 0MQ specific names and
handle denied state absence.
2014-12-15 08:32:53 +03:00
Dmitry Kuzmenko
2b7cdc6326 Minor. Removed unneeded logging 2014-12-15 08:32:53 +03:00
Dmitry Kuzmenko
40c8728b50 Implemented presence events firing and presence request support. 2014-12-15 08:32:53 +03:00
Joseph Hall
91b963274a Merge pull request #18975 from s0undt3ch/hotfix/sysrc-virtual-fix
The return value of `__virtual__` should never be `None`
2014-12-13 07:18:39 -07:00
Pedro Algarvio
d301d8c25e The return value of __virtual__ should never be None 2014-12-13 09:38:15 +00:00
Gareth J. Greenaway
e39557b2a9 Fixing the path that the gpg module uses if the user is salt to be pulled from salt.syspaths. Similar fix to #18968 2014-12-12 20:55:12 -08:00
Nicole Thomas
4b3135ba54 Merge pull request #18970 from s0undt3ch/hotfix/skip-if-no-sshd-server-running
Skip tests which require the SSHD server running in case it's not
2014-12-12 19:39:17 -07:00
Pedro Algarvio
71df7ac58a Skip tests which require the SSHD server running in case it's not 2014-12-13 00:11:41 +00:00
Thomas S Hatch
1a766af93c Merge pull request #18959 from thatch45/zipfile_shadow
fix zip_file shadowing per #18933
2014-12-12 14:28:05 -07:00
Joseph Hall
fcf7df3704 Merge pull request #18962 from jacksontj/develop
Docs cleanup
2014-12-12 12:49:51 -07:00
Thomas Jackson
4d41fa35a1 Comma cleanup 2014-12-12 11:40:36 -08:00
Thomas Jackson
2bd05998b3 Comma cleanup 2014-12-12 11:40:10 -08:00
Thomas Jackson
2fa6dad350 Comma cleanup 2014-12-12 11:39:55 -08:00
Thomas Jackson
fb7e5630d8 Comma cleanup 2014-12-12 11:39:40 -08:00
Thomas Jackson
f0aae727ce Comma cleanup 2014-12-12 11:39:07 -08:00
Thomas Jackson
d5d0a35297 Comma cleanup 2014-12-12 11:38:50 -08:00
Thomas Jackson
57933e9148 Comma cleanup 2014-12-12 11:38:18 -08:00
Thomas Jackson
85864eca4a Comma cleanup 2014-12-12 11:37:59 -08:00
Thomas Jackson
7da2bbc457 fix usage of e.g (no comma) 2014-12-12 11:37:48 -08:00
Thomas Jackson
8df54973c3 Comma cleanup 2014-12-12 11:34:51 -08:00
Thomas Jackson
da3ea213e9 Comma cleanup 2014-12-12 11:34:34 -08:00
Thomas Jackson
23674c100d Comma cleanup 2014-12-12 11:33:14 -08:00
Thomas Jackson
c1860f3dd9 Comma cleanup 2014-12-12 11:32:58 -08:00
Thomas Jackson
8b635fe07d Comma Cleanup 2014-12-12 11:32:16 -08:00
Thomas Jackson
3f4b2cc8bb Comma cleanup 2014-12-12 11:31:43 -08:00
Thomas S Hatch
3def3ea5d4 doh! 2014-12-12 10:42:49 -07:00
Thomas S Hatch
b7e63884d5 fix zip_file shadowing per #18933 2014-12-12 10:38:52 -07:00
Thomas S Hatch
bc95c6e799 fix the change in location for the exitcodes file 2014-12-12 10:32:19 -07:00
Thomas S Hatch
b9afe18423 Merge pull request #18949 from techhat/awsversion
Update AWS/EC2 versions to 2014-10-01
2014-12-12 10:00:34 -07:00
Thomas S Hatch
c154936b5d Merge pull request #18957 from thatch45/basepi-salt-ssh-publish.publish
Merge #18944
2014-12-12 09:59:59 -07:00
Thomas S Hatch
9166c22003 lint 2014-12-12 09:59:20 -07:00
Thomas S Hatch
84121e14fe Merge branch 'salt-ssh-publish.publish' of https://github.com/basepi/salt into basepi-salt-ssh-publish.publish 2014-12-12 09:58:38 -07:00
Thomas S Hatch
bdc907dab6 Merge branch '2014.7' into merge_forward_8798
Conflicts:
	salt/cli/__init__.py
	salt/cloud/clouds/ec2.py
	salt/scripts.py
	salt/utils/__init__.py
	salt/utils/saltminionservice.py
2014-12-12 09:49:34 -07:00
Thomas S Hatch
a1406d103e Merge pull request #18913 from xhenner/develop
Make /etc/salt-master usefull
2014-12-12 09:41:56 -07:00
Thomas S Hatch
e094b0136f Merge pull request #18902 from jacksontj/develop
More grammar/style cleanup
2014-12-12 09:40:55 -07:00
Seth House
91c40e37fc Merge pull request #18952 from techhat/serialcomma
Add serial commas to the style guide
2014-12-12 08:01:14 -07:00
Rupesh Tare
c86bdb6c16 created unit test case for function atq from module at 2014-12-12 19:23:22 +05:30