jacobhammons
de727d8bd2
Merge pull request #28031 from jacobhammons/relnotes6
...
Updated release notes with additional CVE information
2015-10-16 10:19:37 -06:00
Jacob Hammons
05927bb6f0
Updated release notes with additional CVE information
2015-10-16 10:18:42 -06:00
twangboy
2bcac93314
Fixed win_path.py
...
Moved vdata and split to the same line
No need to check for string types
2015-10-16 09:36:12 -06:00
Mike Place
16c0272849
Merge pull request #28008 from jfindlay/host_path
...
platform independent line endings in hosts mod
2015-10-16 07:20:28 -06:00
Mike Place
d41018fa8e
Merge pull request #28012 from rallytime/fix-28010
...
Clean up stack trace when something goes wrong with minion output
2015-10-16 06:40:59 -06:00
rallytime
0d7059e0c2
Clean up stack trace when something goes wrong with minion output
...
Fixes #28010
2015-10-16 05:13:52 -06:00
Justin Findlay
9f7047dd3c
platform independent line endings in hosts mod
...
Fixes #27897 .
2015-10-16 00:11:39 -06:00
rallytime
f8380d751e
Provide empty string as default stdout instead of None
2015-10-15 16:19:08 -06:00
Colton Myers
f728307001
Merge pull request #27995 from jacobhammons/pillar-doc
...
added link to grains security FAQ to targeting and pillar topics.
2015-10-15 15:15:31 -06:00
rallytime
f9406b5828
Don't fail if pip package is already present and pip1 is installed
...
Refs #21845
2015-10-15 15:11:21 -06:00
Jacob Hammons
2870af2ba3
added link to grains security FAQ to targeting and pillar topics.
2015-10-15 15:05:35 -06:00
Mike Place
efede904a7
Merge pull request #27986 from jacobhammons/dot6
...
Changed current release to 5.6 and added CVE to release notes
2015-10-15 11:25:41 -06:00
Jacob Hammons
bb61c68c11
Changed current release to 5.6 and added CVE to release notes
2015-10-15 11:19:11 -06:00
Mike Place
831ec680d9
Merge pull request #27913 from pass-by-value/proxmox_verify_ssl
...
Set default
2015-10-14 08:03:36 -06:00
Aditya Kulkarni
0b721efe37
Set default
2015-10-13 16:15:42 -04:00
Mike Place
41cccb3a30
Merge pull request #27876 from terminalmage/git_pillar-AttributeError-2015.5
...
2015.5 branch: Fix traceback when 2015.8 git ext_pillar config schema used
2015-10-13 08:58:45 -06:00
Erik Johnson
07794c837a
2015.5 branch: Fix traceback when 2015.8 git ext_pillar config schema used
...
If the new gitfs-backed git_pillar configuration schema is used, the
Maintenance process will endlessly crash and restart itself because of a
traceback raised when parsing the ext_pillar configuration. This commit
fixes that by catching the AttributeError and logging an error to the
master log.
2015-10-12 14:30:20 -05:00
Mike Place
c9c3b7760e
Merge pull request #27726 from jfindlay/hashhosts
...
deprecate hash_hostname in favor of hash_known_hosts
2015-10-12 10:19:09 -06:00
Mike Place
18e31584b0
Merge pull request #27776 from jfindlay/local_msg
...
return message when local jobs_cache not found
2015-10-12 10:11:41 -06:00
Mike Place
86cc7b5537
Merge pull request #27766 from jfindlay/debmail
...
better check for debian userdel error
2015-10-12 09:14:33 -06:00
Mike Place
c224386c9a
Merge pull request #27758 from iggy/patch-1
...
Remove redundant text from syslog returner
2015-10-12 09:09:49 -06:00
Mike Place
34a005041f
Merge pull request #27841 from terminalmage/issue27832
...
Detect Manjaro Linux as Arch derivative
2015-10-12 08:53:46 -06:00
Mike Place
3944a498ad
Merge pull request #27852 from rallytime/bp-27806
...
Back-port #27806 to 2015.5
2015-10-12 08:53:17 -06:00
Devon Stewart
a84bf18bc4
Empty string is falsy
2015-10-10 17:13:50 -06:00
Mike Place
7508a1c474
Merge pull request #27838 from basepi/fix.runner.highstate.outputter.27831
...
[2015.5] Fix highstate outputter for jobs.lookup_jid
2015-10-09 16:26:28 -06:00
Erik Johnson
8e09fbd6a3
Detect Manjaro Linux as Arch derivative
...
Fixes #27832 .
2015-10-09 16:53:38 -05:00
Colton Myers
8ae9b66fd9
Don't pop 'outputter', we expect it further down
...
Also correctly wrap the output of orchestrate with 'data' key
This was put in as a fix for the orchestrate runner in #25521 . However,
we just needed to wrap the return in 'data' to get it to be stripped
automatically. The lack of 'outputter' was causing us to not properly
strip the 'data' further down, and the highstate outputter would
subsequently barf.
2015-10-09 14:42:40 -06:00
Nicole Thomas
d178315f93
Merge pull request #27791 from eguven/2015.5-postgres-user-groups-backport
...
2015.5 postgres_user groups backport
2015-10-08 17:59:08 -06:00
Eren Güven
2caf1d21d6
fix test
2015-10-08 14:57:33 +02:00
Eren Güven
bc90c5bffe
improve change reporting for postgres_user groups
2015-10-08 12:14:24 +02:00
Eren Güven
8712bce91a
backport postgres_user groups
2015-10-08 11:34:54 +02:00
Justin Findlay
03afa3cffa
return message when local jobs_cache not found
...
Fixes #27735 .
2015-10-07 16:44:39 -06:00
Justin Findlay
ee78da2c27
better check for debian userdel error
...
Fixes #27665 .
2015-10-07 13:41:06 -06:00
Colton Myers
b2937b6a16
Merge pull request #27759 from basepi/merge-forward-2015.5
...
[2015.5] Merge forward from 2014.7 to 2015.5
2015-10-07 12:01:54 -06:00
Colton Myers
792ee084bb
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5
2015-10-07 12:00:53 -06:00
Justin Findlay
4b9128b491
Merge pull request #27732 from jacobhammons/26673
...
update docs for __virtual__ and __virtualname__
2015-10-07 11:29:31 -06:00
Brian Jackson
0994fb6a8c
Remove redundant text from syslog returner
...
The implicit call to syslog.openlog will already add salt-minion (technically `sys.argv[0]`) to the syslog.syslog call. It's redundant (and not technically correct) to have salt-minion here.
Can also be applied to 2015.8 and develop without issue.
Fixes #27756
2015-10-07 10:24:40 -07:00
Nicole Thomas
a130896d1c
Merge pull request #27747 from Sacro/fix-chocolatey-version
...
Chocolatey doesn't have a help command.
2015-10-07 10:06:53 -06:00
Jacob Hammons
75cc07cf10
noted that __virtual__ can return False and an error string
2015-10-07 09:48:46 -06:00
Ben Woodward
8f1fa9e78e
Chocolatey doesn't have a help command.
2015-10-07 13:44:51 +01:00
jacobhammons
4e48651de0
Merge pull request #27733 from jacobhammons/bug-fixes
...
hardening topic - updates to docs.saltstack.com theme
2015-10-06 19:44:00 -06:00
Jacob Hammons
cbecd4f553
Updated saltstack2 theme to add SaltConf16 banner
2015-10-06 17:38:49 -06:00
Jacob Hammons
117e0c2bcc
Added hardening topic based on the information in Refs #27088
2015-10-06 17:36:54 -06:00
Jacob Hammons
b928e1afa8
update docs for __virtual__ and __virtualname__
...
Refs #26673
2015-10-06 17:23:42 -06:00
Justin Findlay
ebce47de7c
add docs to ssh.recv_known_host exec module fcn
2015-10-06 14:50:14 -06:00
Justin Findlay
b6ee16b1e5
deprecate hash_hostname in favor of hash_known_hosts
...
Fixes #27201 , #27610 . #27201 was incomplete in its deprecation of
hash_hostname.
2015-10-06 14:48:19 -06:00
Nicole Thomas
c58da846bf
Merge pull request #27706 from jacobhammons/bug-fixes
...
Assorted doc bugs
2015-10-05 23:35:29 -06:00
Jacob Hammons
76dc8de71b
Assorted doc bugs
...
Refs #9051
Refs #13407
Refs #21475
Refs #14876
Refs #27005
2015-10-05 17:37:13 -06:00
Colton Myers
43fba89865
Merge pull request #27695 from rallytime/bp-27671
...
Back-port #27671 to 2015.5
2015-10-05 15:57:36 -06:00
Colton Myers
cb3d92676e
Merge pull request #27524 from jfindlay/pkgng_quiet
...
parse pkgng output in quiet mode for >= 1.6.1
2015-10-05 15:22:40 -06:00
