Mike Place
e40709b7c8
Merge pull request #15893 from rallytime/ec2_config_docs
...
Clarify region settings in ec2 config docs
2014-09-17 16:22:04 -06:00
rallytime
9a4f9e6fae
Clarify region settings in ec2 config docs
2014-09-17 16:16:35 -06:00
Mike Place
2b4ff38897
Merge pull request #15888 from rallytime/service_mod_docs
...
Update service.reload docs
2014-09-17 15:04:00 -06:00
Samuel Smith
2808c45ad6
Merge pull request #15889 from SmithSamuelM/2014.7_sam4
...
Explicitly set raet role Added opts for raet_main and raet_mutable
2014-09-17 14:58:59 -06:00
Samuel M Smith
7bae31c978
Remoted wingdbstub comment
2014-09-17 14:56:32 -06:00
rallytime
7ed8be8e89
Update service.reload docs
2014-09-17 14:53:43 -06:00
Thomas S Hatch
12ef4c7d2e
Merge pull request #15881 from thatch45/master_id
...
Give the master a unique id
2014-09-17 14:53:31 -06:00
Samuel M Smith
bff17d1dc0
Merge remote-tracking branch 'upstream/2014.7' into 2014.7_sam4
2014-09-17 14:52:51 -06:00
Samuel M Smith
ce54e579e0
Explicitly set raet role
2014-09-17 14:50:02 -06:00
Thomas S Hatch
b2e9484945
Merge pull request #15722 from cachedout/issue_15415
...
Ping on AES rotate
2014-09-17 14:40:21 -06:00
Mike Place
50579b31cd
Set default to false
2014-09-17 14:38:42 -06:00
Thomas S Hatch
8a62de59c7
give the master a unique id
2014-09-17 13:56:55 -06:00
Thomas S Hatch
d35e38907f
Merge branch 'SmithSamuelM-2014.7_sam3' into 2014.7
2014-09-17 13:49:48 -06:00
Thomas S Hatch
9b54e5b55a
lint fixes
2014-09-17 13:49:29 -06:00
Thomas S Hatch
1cb62b7e76
Merge branch '2014.7_sam3' of https://github.com/SmithSamuelM/salt into SmithSamuelM-2014.7_sam3
2014-09-17 13:47:01 -06:00
Erik Johnson
27bea519c9
Merge pull request #15879 from s0undt3ch/hotfix/protect-from-older-libcloud
...
Allow the docs to build by faking libcloud's `__version__` attribute.
2014-09-17 14:42:45 -05:00
Samuel M Smith
ea1aa72115
road stack setup now uses opts 'raet_mutable' and 'raet_main'
2014-09-17 13:04:02 -06:00
Pedro Algarvio
75bafbd6db
Allow the docs to build by faking libcloud's __version__
attribute.
2014-09-17 20:03:48 +01:00
Nicole Thomas
5e248e0ebd
Merge pull request #15842 from whiteinge/doc-salt-unity-data-files
...
Added salt-unity manpages to setup.py data_files
2014-09-17 12:55:06 -06:00
Nicole Thomas
9ddaeb5847
Merge pull request #15873 from terminalmage/fix-docstring
...
Fix incorrect docstring
2014-09-17 12:53:54 -06:00
Erik Johnson
736659a720
Fix incorrect docstring
...
mod_watch just executes the module.run state here, which does not use
the 'func' parameter. This commit fixes the documentation to reflect the
proper argument name.
2014-09-17 12:40:04 -05:00
Thomas S Hatch
1be9c6aa64
Merge pull request #15868 from rallytime/bp_f8177149
...
Backport f8177149
2014-09-17 11:38:44 -06:00
Samuel M Smith
8855520820
Added raet_mutable and raet_main config opts to salt.
...
raet_mutable enables (True) a mutable raet road where rejoins can change road data otherwise no changes allowed on rejoin
raet_main enables (True) the raet road stack to accept vacuous joins otherwise no vacuous joins accepted
2014-09-17 11:31:23 -06:00
Cimarron Mittelsteadt
986b375583
BUG: Fix the absolute directory check in file.symlink for the path of the symbolic link itself and perform user expansion on that.
...
Conflicts:
salt/modules/file.py
2014-09-17 09:21:16 -06:00
Nicole Thomas
b5d0865ef9
Merge pull request #15854 from terminalmage/bp-15546
...
Backport #15546 to 2014.7 branch
2014-09-16 20:11:15 -06:00
Erik Johnson
c24969b2c0
Remove unused import
2014-09-16 18:59:47 -05:00
Mathieu Le Marec - Pasquet
7b25a42f23
Fix encoding issues in nested output
...
This fixes #15542
2014-09-16 18:57:37 -05:00
David Boucha
caccd64dc6
Merge pull request #15853 from terminalmage/buildpackage-el5
...
Fix --define directive for Cent5 builds
2014-09-16 17:21:14 -06:00
Erik Johnson
3f19d518fb
Fix --define directive for Cent5 builds
2014-09-16 18:16:44 -05:00
Samuel M Smith
11dfa28836
Merge branch 'raetpeer_3' into 2014.7_sam3
...
Conflicts:
salt/transport/__init__.py
2014-09-16 16:32:44 -06:00
Thomas S Hatch
c8b8cb3682
Merge pull request #15848 from cachedout/multimaster_opts
...
Re-inject opts into modules under multi-master mode.
2014-09-16 16:02:14 -06:00
Mike Place
e237179706
Re-inject opts into modules under multi-master mode.
2014-09-16 15:16:32 -06:00
Thomas S Hatch
de5c78ce9c
Merge pull request #15843 from thatch45/ssh_version
...
Add ssh version check
2014-09-16 14:28:46 -06:00
Thomas S Hatch
9849bf3dee
Merge pull request #15841 from thatch45/random_audit
...
Add some calls to systemrandom where it might be good to have a
2014-09-16 13:55:49 -06:00
Seth House
1e6155928f
Added salt-unity manpages to setup.py data_files
...
Refs #13937
2014-09-16 12:01:16 -07:00
Colton Myers
8168230eab
Merge pull request #15821 from rallytime/azure_cloud_tests
...
Add Azure cloud provider tests
2014-09-16 12:55:45 -06:00
Thomas S Hatch
12b9b52dcb
Add some calls to systemrandom where it might be good to have a
...
little better random data
2014-09-16 12:37:49 -06:00
Thomas S Hatch
6e6a0ae420
Merge pull request #15838 from thatch45/random_fix
...
Always use system random
2014-09-16 12:24:40 -06:00
Thomas S Hatch
62b94b1e24
Always use system random
2014-09-16 11:43:25 -06:00
Thomas S Hatch
c85e889eb4
Add ssh version chgeck
2014-09-16 11:40:36 -06:00
Thomas S Hatch
339d37a310
Merge pull request #15818 from jacksontj/2014.7
...
A couple useful features that we should probably include
2014-09-16 09:43:42 -06:00
Thomas S Hatch
5b15a5d6bb
Merge pull request #15819 from s0undt3ch/hotfix/protect-from-older-libcloud
...
Protect against older libcloud versions
2014-09-16 09:43:05 -06:00
Thomas S Hatch
66ac56a0e0
Merge pull request #15813 from terminalmage/issue13878
...
Encode/Decode unicode characters in cmd.run states
2014-09-16 09:41:58 -06:00
rallytime
85f82816c2
Revert "Put provider specific information only in provider configuration file"
...
This reverts commit 1ccec204b2
.
2014-09-16 08:40:43 -06:00
rallytime
a5c658b337
Disable pylint unused import warning
2014-09-16 07:14:38 -06:00
rallytime
1ccec204b2
Put provider specific information only in provider configuration file
2014-09-16 07:08:18 -06:00
rallytime
2801dfbee4
Rename azure tests to match cloud module and add azure sdk import back in
2014-09-16 06:35:12 -06:00
Pedro Algarvio
fa57f5e89b
Split on dots
2014-09-16 05:19:41 +01:00
Thomas Jackson
91de660025
Make sure to handle case where timeout isn't set (misconfigured master?)
2014-09-15 19:24:51 -07:00
rallytime
35793bd8d9
Pylint fix
2014-09-15 20:20:37 -06:00