valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
60,421 Commits 24 Branches 182 Tags 341 MiB
fc8d51aa5c
Commit Graph

60421 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Vogel
fc8d51aa5c Fix #28060 
Correct the `pip` command. install should be getting `global-options` not `pip` itself.
 2015-10-17 18:35:18 +02:00
Joseph Hall
8d85cb9ea8 Merge pull request #28043 from gtmanfred/libcloud-nova 
the nova driver does not require libcloud
 2015-10-16 20:48:15 -06:00
Joseph Hall
46b75af250 Merge pull request #28041 from gtmanfred/develop 
use the correct discover_extensions
 2015-10-16 20:47:04 -06:00
Daniel Wallace
e76571a012 the nova driver does not require libcloud 
The only thing used from libcloudfuncs is the script and reboot, which
both hook through the regular connection, and are namespaced down to the
nova driver.  they use the regular conn, which hooks to the SaltNova
library in order to reboot the server.
 2015-10-16 14:30:11 -05:00
Daniel Wallace
188fcc5bc8 use the correct discover_extensions 
This shouldn't have ever been used, it should have always used the real
discover_extension in the main client module.

Right now nova is broken with the current novaclient release, which
removes _discover_extensions from OpenStackComputeShell
 2015-10-16 14:14:26 -05:00
Mike Place
1f8d65c402 Merge pull request #27606 from plastikos/bug-scaling_zmq_hwm 
RFC: Add additional ZMQ tuning parameters necessary for 1k+ minions per master [WIP]
 2015-10-16 10:03:56 -06:00
Colton Myers
153087a7b4 Merge pull request #26945 from dr4Ke/feature_state_grains_support_nested_and_dict 
Feature state grains support nested and dict
 2015-10-15 14:25:44 -06:00
Mike Place
c78e1e26bf Merge pull request #27987 from lyft/boto_vpc-main-route-association 
Do not try to remove the main route table association
 2015-10-15 12:59:09 -06:00
Ryan Lane
0405e3701a Do not try to remove the main route table association 2015-10-15 11:12:03 -07:00
Mike Place
6f4ae56471 Merge pull request #27967 from isbm/isbm-philips-hue-httpfix 
Philips HUE lamps Proxy Minion: remove 'requests'
 2015-10-15 11:28:46 -06:00
Bo Maryniuk
7154499be5 Disable PyLint at some point 
Signed-off-by: Bo Maryniuk <bo@suse.de>
 2015-10-15 18:14:10 +02:00
Mike Place
d0a9c64a7d Merge pull request #27963 from cachedout/issue_24921 
Consoldate event unpacking and adjust logging message
 2015-10-15 09:05:19 -06:00
Mike Place
91bf9eb079 Fix bug with mine send 2015-10-15 06:58:20 -06:00
Mike Place
a498bc5d13 Merge pull request #27952 from tomwalsh/develop 
Corrected format of arp_ip_target in network config files and modprobe files
 2015-10-15 06:48:53 -06:00
Mike Place
2931e26987 Merge pull request #27974 from SeverinLeonhardt/firewalld_fix_get_masquerade 
Fix firewalld.get_masquerade
 2015-10-15 06:42:57 -06:00
Mike Place
bd53777865 Merge pull request #27966 from lyft/boto_asg-fix-bad-return 
Fix boto_asg.present to not hide failure when sub-call succeeds
 2015-10-15 06:37:32 -06:00
Mike Place
a771ae043e Merge pull request #27975 from cachedout/lint_27962 
Versionadded string for memory beacon
 2015-10-15 06:29:01 -06:00
Mike Place
772995f002 Versionadded string for memory beacon 2015-10-15 06:28:32 -06:00
Mike Place
2cdc072863 Merge pull request #27962 from itsamenathan/memusage-beacon 
Add memory usage beacon
 2015-10-15 06:27:30 -06:00
Severin Leonhardt
994522e1fa Fix firewalld.get_masquerade 
['no'] == 'no' is never true. It must be checked if the list contains the
string 'no'.
 2015-10-15 11:16:22 +02:00
Bo Maryniuk
05642bedf1 Fix lint 2015-10-15 10:32:16 +02:00
Nathan W
7f862b18ba Fixed PEP8 E303 2015-10-14 21:14:05 -05:00
Bo Maryniuk
5a4f882d35 Make compatible with Python 3 2015-10-15 01:35:12 +02:00
Bo Maryniuk
2fff61be25 Remove 3rd party 'requests' 2015-10-15 01:33:18 +02:00
Ryan Lane
f46e499d09 Fix boto_asg.present to not hide failure when sub-call succeeds 2015-10-14 16:26:45 -07:00
Mike Place
b23a06af4e Consoldate event unpacking and adjust debug message 
Closes #24921
 2015-10-14 15:56:34 -06:00
Nathan W
8483a311f7 add memory usage beacon 
Beacon used for testing the percent of memory used
 2015-10-14 16:27:55 -05:00
Mike Place
18af1670bc Merge pull request #27948 from erchn/fix_subset_eauth 
pass along kwargs for subset cmd to support eauth properly
 2015-10-14 14:26:38 -06:00
Mike Place
e19cb49399 Merge pull request #27950 from lomeroe/boto_ec2_enis_unbound_var 
Boto ec2 enis unbound var
 2015-10-14 14:25:49 -06:00
Christophe Drevet-Droguet
d40ce3826e grains module and state: documentation fixes 2015-10-14 22:18:47 +02:00
tomwalsh
373adb13a7 Changed output format of arp_ip_target from list to comma delimited string 2015-10-14 15:48:48 -04:00
Christophe Drevet-Droguet
1e3f1b0961 grains module and state: use a unique object... 
instead of a magic string to check the existence of a key/value
 2015-10-14 20:52:20 +02:00
Ethan Erchinger
8edcbeff29 pass along kwargs for subset cmd 2015-10-14 18:18:58 +00:00
Colton Myers
3ff9c63357 Merge pull request #27887 from basepi/merge-forward-develop 
Merge forward from 2015.8 to develop
 2015-10-14 09:58:33 -06:00
Nicole Thomas
375b479009 Merge pull request #27909 from twellspring/patch-7 
htpasswd module add comment about dependency on apache2-utils
 2015-10-14 09:58:13 -06:00
Mike Place
90343a7598 Merge pull request #27936 from pawelsocha/develop 
fixing git fetch problem with None in command
 2015-10-14 08:38:35 -06:00
Mike Place
c51216d57d Merge pull request #27939 from DSRCompany/issues/27901_rename_pillar_cmdline 
Rename target for '--pillar' boolean cmdline option.
 2015-10-14 08:35:02 -06:00
Mike Place
49c1ce3238 Merge pull request #27903 from srkunze/venv_docs_fix 
fixed the venv docs once again
 2015-10-14 08:32:06 -06:00
Mike Place
35b5fb7e5f Merge pull request #27907 from erchn/fix_cli_eauth 
pass along kwargs data so gather_job_info so find_job will use eauth
 2015-10-14 08:23:38 -06:00
Mike Place
8faa6a5103 Merge pull request #27904 from lyft/grafana2 
Initial grafana2 state
 2015-10-14 08:17:46 -06:00
Mike Place
4327842eaf Merge pull request #27935 from DSRCompany/issues/27934_handle_exit_event 
Handle 'salt/event/exit' in event loop
 2015-10-14 08:16:34 -06:00
Mike Place
f84fa74a6d Merge pull request #27910 from twellspring/patch-8 
htpasswd state add comment about dependency on apache2-utils
 2015-10-14 08:03:59 -06:00
Mike Place
3c91789fbb Merge pull request #27925 from lyft/boto_secgroup-fixes 
Do not manage ingress or egress rules if set to None
 2015-10-14 08:01:42 -06:00
Mike Place
7a71f461a8 Merge pull request #27917 from erchn/fix_push_dir_glob 
only look at basename of file path for glob match
 2015-10-14 08:01:16 -06:00
Mike Place
1e879b80f9 Merge pull request #27931 from magnusboman/fix_cosmetic_timeout_value 
Cosmetic; wait is in seconds. Don't multiple with 1000
 2015-10-14 07:58:40 -06:00
Mike Place
85ce47c9ed Merge pull request #27929 from isbm/isbm-philips-hue 
Philips HUE lamps Proxy Minion
 2015-10-14 07:57:52 -06:00
Mike Place
ac1717e156 Merge pull request #27937 from DSRCompany/issues/23373_highstate_output_error 
Bugfix for highstate return data handler.
 2015-10-14 07:56:24 -06:00
Dmitry Kuzmenko
82a3cb74e6 Rename target for '--pillar' boolean cmdline option. 
Use 'pillar_target' as a destination for '--pillar' cmdline argument to
avoid conflict with pillar data dict.
 2015-10-14 15:01:58 +03:00
Bo Maryniuk
39050f84d7 Add the license 2015-10-14 12:12:28 +02:00
Bo Maryniuk
300b669615 Fix the docstring 2015-10-14 12:12:17 +02:00