Commit Graph

54172 Commits

Author SHA1 Message Date
Thomas S Hatch
dccb83e1ca Merge pull request #24424 from skizunov/develop2
On Windows running salt with admin privileges now authenticates
2015-06-05 18:18:28 -06:00
Nicole Thomas
98608c8a78 Merge pull request #24423 from garethgreenaway/refactor_random_salt_utils_http
Refactoring random.org module to use salt.utils.http instead of requests
2015-06-05 11:09:17 -06:00
Justin Findlay
ec32648849 Merge pull request #24453 from bechtoldt/pkg_runner_docs
set versionadded Beryllium for salt.runners.pkg
2015-06-05 09:33:53 -06:00
Justin Findlay
cfe1e2cc01 Merge pull request #24442 from ajacoutot/openbsd-network
openbsd: add _openbsd_remotes_on
2015-06-05 09:19:29 -06:00
Justin Findlay
69965de8e2 Merge pull request #24441 from arthurlogilab/patch-6
[doc] Alignement fix on external_auth documentation
2015-06-05 09:15:11 -06:00
Arnold Bechtoldt
9b66f09b83 set versionadded Beryllium for salt.runners.pkg 2015-06-05 16:56:18 +02:00
Antoine Jacoutot
aacf1ebf08 openbsd: add _openbsd_remotes_on
Helper function to natively returns a set of ipv4 host addresses of both local
and remote established connections without needing to depend on lsof(8).
2015-06-05 12:33:46 +02:00
Arthur Lutz
24502e2655 [doc] Alignement fix on external_auth documentation 2015-06-05 12:32:21 +02:00
Gareth J. Greenaway
c95f8be0ae Updating unit tests based on changes to module. 2015-06-04 20:33:52 -07:00
Gareth J. Greenaway
8d7906bce1 removing unnecessary imports. 2015-06-04 20:33:52 -07:00
Gareth J. Greenaway
e896c4a788 Refactoring random.org module to use salt.utils.http instead of requests 2015-06-04 20:33:52 -07:00
Nicole Thomas
0ca6e26e1c Merge pull request #24432 from rallytime/whitespace
Whitespace fix
2015-06-04 19:31:03 -06:00
rallytime
87fd5355c4 Whitespace fix 2015-06-04 19:24:23 -06:00
Nicole Thomas
80d6e6579c Merge pull request #24431 from rallytime/merge-24417
Merge #24417 with pylint fixes
2015-06-04 18:57:46 -06:00
Nicole Thomas
6b0044ad17 Merge pull request #24421 from bechtoldt/update_docs
add missing module documentation
2015-06-04 18:30:39 -06:00
Nicole Thomas
97104eee8c Merge pull request #24415 from garethgreenaway/refactor_slack_salt_utils_http
Switching slack module and slack returner to using salt.utils.http
2015-06-04 18:25:39 -06:00
Nicole Thomas
b770939605 Merge pull request #24425 from jtand/docstring_rpm
Added example docstring to fix test failures
2015-06-04 18:21:49 -06:00
Nicole Thomas
75890b2818 Merge pull request #24410 from jtand/pkg_resource
Changed mock path to be absolute in test_parse_targets
2015-06-04 18:21:07 -06:00
rallytime
e739a99d9f Merge #24417 with pylint fixes
Refs #24417
2015-06-04 18:17:58 -06:00
Justin
356bfa7f74 Added example docstring to fix test failures 2015-06-04 15:44:56 -06:00
Sergey Kizunov
270267ea16 On Windows running salt with admin privileges now authenticates
On Windows, salt.utils.get_specific_user will now return
'sudo_<username>' when the the client process has administrator
privileges (eg used "Run as administrator" option).

This enables communication with the master if the client and
salt-master processes are run as different users (which is a
common use case when salt-master is run as a service and the
'salt' command is run in an administrator cmd.exe under the
logged in user).

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
2015-06-04 16:22:56 -05:00
Justin
db839960a0 Moved it back up above exceptions import 2015-06-04 15:17:31 -06:00
Thomas S Hatch
7cd2950ec6 Merge pull request #24418 from garethgreenaway/victorops_support
Victorops support
2015-06-04 14:50:48 -06:00
Gareth J. Greenaway
921827c8dd removing unneeded imports to fix lint issues. 2015-06-04 13:34:49 -07:00
Thomas S Hatch
ebd63a7a70 Merge pull request #24364 from DSRCompany/salt_ssh_identities_only
Salt ssh identities only
2015-06-04 14:06:58 -06:00
C. R. Oldham
fcb1ae179b Merge pull request #24341 from nKaloussian/add-cloudstack-displayname
Provide option to set a display name. Defaults to instance's name.
2015-06-04 14:03:17 -06:00
Arnold Bechtoldt
fc7f0724d3 add missing module documentation to references 2015-06-04 21:17:24 +02:00
Gareth J. Greenaway
55f1477de7 Adding documentation for some parameters previously missed. If adding the event failed, return False with the failure message. 2015-06-04 11:51:38 -07:00
Gareth J. Greenaway
3fb6ef686f Initial addition for execution and state modules to send events to VictorOps. 2015-06-04 11:51:37 -07:00
Justin
ffb5018c53 Fixed a small pylint error 2015-06-04 12:42:15 -06:00
Gareth J. Greenaway
64dedc0997 Removing unneeded logging statements. Adding log statement that was mistakenly removed. 2015-06-04 11:34:31 -07:00
Gareth J. Greenaway
b480e89688 Switching slack module and slack returner to using salt.utils.http 2015-06-04 11:31:09 -07:00
Nejteh Kaloussian
26e65333e0 Fix PyLint error. 2015-06-04 13:52:45 -04:00
Nejteh Kaloussian
514aafd1a8 Merge branch 'develop' of https://github.com/saltstack/salt into add-cloudstack-displayname 2015-06-04 13:52:11 -04:00
Justin
1df4020ec2 Changed mock path to be absolute in test_parse_targets 2015-06-04 11:11:33 -06:00
Joseph Hall
ca2b7320bb Merge pull request #24404 from edouardb/scaleway-provider-doc
Add Getting Started for Scaleway provider
2015-06-04 09:33:38 -06:00
Justin Findlay
76b54fc886 Merge pull request #24393 from dr4Ke/fix_grains.set_preserve_list_order
Fix grains.set preserve list order
2015-06-04 09:10:19 -06:00
Justin Findlay
a5d14ec78a Merge pull request #24392 from quixoten/use_found_cmd_path
Fix "No such file or directory" in grains/core.py
2015-06-04 09:08:06 -06:00
Nicole Thomas
ddc167907f Merge pull request #24335 from nmadhok/patch-cloud
Only pop the key if the key exists otherwise do nothing
2015-06-04 08:47:58 -06:00
Edouard Bonlieu
908b27869d Add Getting Started for Scaleway provider 2015-06-04 16:23:06 +02:00
Christophe Drevet-Droguet
c902cb7f51 module function grains.set: fix preserve list order 2015-06-04 09:57:29 +02:00
Christophe Drevet-Droguet
7b9451451f module grains tests: test list order preservation 2015-06-04 09:52:09 +02:00
Devin Christensen
b69e0cf710 Use path found by salt.utils.which
I ran into this problem running `salt-ssh '*' test.ping` with a
XenServer 6.5 node as the target. Even though the `lspci` and
`dmidecode` (after I installed it) commands are found by
`salt.utils.which`, because they're not actually in the `$PATH`, they
fail to execute.
2015-06-04 01:29:29 -06:00
Justin Findlay
c40e5d8d12 Merge pull request #24377 from lyft/boto-kms-docs
Add boto_kms docs
2015-06-03 17:03:34 -06:00
Nicole Thomas
f9f16de77e Merge pull request #23620 from lyft/boto-util-get-error-fix
Make boto util get_error function compatible with newer boto modules
2015-06-03 16:34:35 -06:00
Ryan Lane
a3924bba0e Add boto_kms docs 2015-06-03 15:18:52 -07:00
Colton Myers
6c84fa03a0 Merge pull request #24373 from basepi/merge-forward-develop
Merge forward from 2015.5 to develop
2015-06-03 15:19:45 -06:00
Justin Findlay
1e0f247447 Merge pull request #24357 from zhujinhe/develop
fix invoke issues of Jinja Macros example
2015-06-03 15:06:30 -06:00
Justin Findlay
5cbebf6832 Merge pull request #24353 from cetra3/file-copy-force-fix
Set changed = true if the file has changed when using file.copy state
2015-06-03 14:38:54 -06:00
Colton Myers
c41d9f4ae2 Reformat lxc.py and fix a bad merge conflict resolution 2015-06-03 13:52:52 -06:00