valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
45,812 Commits 24 Branches 182 Tags 341 MiB
60f215f191
Commit Graph

45812 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Flavian
0a28a462a9 #19162 added disks to Azure VM creation. Only new empty disks are 
supported. Add a line
volumes:
  - { size: 10 (default 100), lun: [0-15](default: 0), disk_label:
<label>(default: <role-name>-disk-<lun>) }
 2015-01-28 13:28:13 -07:00
Colton Myers
3222284235 Do not use 'is' for string comparison 2015-01-28 13:08:40 -07:00
Jille Timmermans
b9d2f5bdfa Fixed the Result of file.replace 2015-01-28 13:06:57 -07:00
Nicole Thomas
16da23c5e7 Merge pull request #20139 from jayeshka/drbd-unit-test 
adding drbd unit test case
 2015-01-28 12:40:58 -07:00
Nicole Thomas
77e71fdd6e Merge pull request #20127 from cachedout/doc_outputter 
Use the nested outputter to display docs with -d
 2015-01-28 12:32:43 -07:00
Nicole Thomas
5b8dd2a1f1 Merge pull request #20153 from rallytime/merge_20144 
Merge #20144 with pylint fix
 2015-01-28 12:16:24 -07:00
Nicole Thomas
a717549c4e Merge pull request #20116 from rallytime/merge_forward_to_fifteen 
Merge 2014.7 into 2015.2
 2015-01-28 12:15:08 -07:00
Nicole Thomas
be9cac8fd1 Merge pull request #20146 from rupeshta/key_unit_tests 
implemented unit test cases for key module
 2015-01-28 12:13:00 -07:00
rallytime
ec7ece47ca Whitespace fix 2015-01-28 12:09:33 -07:00
Joseph Hall
f846925ba7 Document text_out and headers_out 2015-01-28 11:08:31 -07:00
Joseph Hall
d1746fa7fe Document updating CA bundles 2015-01-28 10:51:04 -07:00
Joseph Hall
4712e870be Allow execution module to update_ca_bundle 2015-01-28 10:50:40 -07:00
Joseph Hall
38e349f042 Allow runner to update_ca_bundle 2015-01-28 10:50:04 -07:00
Flavian
6d5c314d70 Removes a line that was causing errors (probably taken from ec2.py) 2015-01-28 18:45:47 +01:00
Thomas S Hatch
19b7db40b8 Merge pull request #19914 from jfindlay/shell_false 
change python_shell default to False
 2015-01-28 10:41:16 -07:00
Joseph Hall
7a805e5db1 Allow user to merge extra files to the end of the CA bundle 2015-01-28 09:55:49 -07:00
Joseph Hall
a619de5444 Change from /srv/salt to file_roots 2015-01-28 09:37:34 -07:00
Mike Place
c86b5c8189 Merge pull request #20151 from rallytime/fix_sock_path_len_test 
Add extension_modules to mocked __opts__ in test_sock_path_len
 2015-01-28 09:30:35 -07:00
Joseph Hall
8d5ff1907d Add function to update CA cert bundle 2015-01-28 09:22:38 -07:00
rallytime
592ff1c748 Add extension_modules to mocked __opts__ in test_sock_path_len 2015-01-28 09:20:26 -07:00
Nicole Thomas
cfe10ed9d6 Merge pull request #20140 from jayeshka/glusterfs-unit-test 
adding glusterfs unit test case
 2015-01-28 08:58:58 -07:00
pille
13f7fe1d8e support --only-upgrade option in apt 
fixes #16293
 2015-01-28 15:30:55 +01:00
Flavian
cba38cbe4f Waiting for attaching disk operation to complete 2015-01-28 15:30:33 +01:00
Flavian
4b7215ee18 #19162 added disks to Azure VM creation. Only new empty disks are 
supported. Add a line
volumes:
  - { size: 10 (default 100), lun: [0-15](default: 0), disk_label:
<label>(default: <role-name>-disk-<lun>) }

Conflicts:
	salt/cloud/clouds/msazure.py
	Also fixes an error in the previous commit where deployment_name should
have been service_name

Conflicts:
	salt/cloud/clouds/msazure.py
 2015-01-28 15:27:58 +01:00
Mike Place
2ee0118e1f Merge pull request #20147 from cachedout/fix_sed_tests 
Fix sed test
 2015-01-28 06:33:23 -07:00
Mike Place
3dcc41de39 Fix sed test 2015-01-28 06:30:39 -07:00
Rupesh Tare
ac4dd17c95 implemented unit test cases for key module 2015-01-28 18:42:31 +05:30
pille
1967888007 fix doc cli markup 2015-01-28 12:17:45 +01:00
quanta
91aa68603f Allow to add extensions to a certificate 2015-01-28 16:26:14 +07:00
Mikhail Matyunin
91200a25e6 Remove breaking "Static" word on line 647 2015-01-28 10:18:32 +03:00
Jayesh Kariya
1718a96d3b adding glusterfs unit test case 2015-01-28 11:30:47 +05:30
Jayesh Kariya
3eda02a5e8 adding drbd unit test case 2015-01-28 11:28:15 +05:30
Thomas S Hatch
eba8d9ec00 Merge pull request #20136 from kev009/sockstat-args 
Try to fix sockstat args for #20044
 2015-01-27 22:00:24 -07:00
Mike Place
a7462da8a8 Merge pull request #20138 from whiteinge/doc-log-granular-warning-syntax 
Fixed syntax error in log_granular_levels example
 2015-01-27 20:16:31 -07:00
Seth House
e3d29bf8ff Fixed syntax error in log_granular_levels example 2015-01-27 20:14:53 -07:00
Mike Place
1a73c46a58 Merge pull request #20137 from whiteinge/schedule-file-open-traceback 
Wrap opening _schedule.conf file in the try..except
 2015-01-27 20:14:18 -07:00
Seth House
f4a0a95f9a Wrap opening _schedule.conf file in the try..except 
Otherwise tracebacks if the file does not exist.
 2015-01-27 20:11:54 -07:00
Mike Place
6bb599bc30 Merge pull request #20130 from cachedout/fix_fstab 
Quote strs
 2015-01-27 20:10:37 -07:00
Kevin Bowling
572865363f Try to fix sockstat args for #20044 2015-01-27 19:47:48 -07:00
Kevin Bowling
23155964f5 Remove unused restart_on_error config 2015-01-27 19:24:29 -07:00
Nicole Thomas
4f3a7ca937 Merge pull request #20132 from thatch45/schedule_fix 
use a get with a fallback
 2015-01-27 18:21:45 -07:00
Marius Gerling
71e20675a0 Extended mysql_user and mysql_grants documentation 
It was hard to figure out, how to set the password for a new
permission allowing the user to log in from another host. mysql_user is
the right state for this. I crosslinked the documentations of both
states. So the information will be found easier by others.
 2015-01-28 01:33:30 +01:00
gweis
6d1d0a404f webutil.useradd throws exception KeyError: 'out' 
return dictionary from cmd.run_all directly.
 2015-01-28 10:14:55 +10:00
Thomas S Hatch
94d90c1455 use a get with a fallback 2015-01-27 17:01:12 -07:00
Ahmed Kamal
db0047c468 Implementing freebsd-status.cpustats 2015-01-28 01:37:17 +02:00
Mike Place
ba37d40d26 Quote strs 2015-01-27 16:00:44 -07:00
Seth House
f900179e48 Added token and salt_token as param docs 
Also un-emphasized this way of passing the token in examples since it is
the lesser-used form of authenticating with this endpoint.
 2015-01-27 15:57:07 -07:00
Ahmed Kamal
95331bf786 pylint fixes 2015-01-28 00:30:12 +02:00
Ahmed Kamal
65f643e5ea Implement freebsd-status.cpuinfo 2015-01-28 00:29:45 +02:00
Mike Place
845a7bf237 Use the nested outputter to display docs with -d 2015-01-27 15:29:26 -07:00