valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
44,379 Commits 24 Branches 182 Tags 341 MiB
7a491b5438
Commit Graph

44379 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Flavian
7a491b5438 If only one VM remains, catch the error from delete_role and delete the 
deployment
 2015-01-22 18:52:30 +01:00
Flavian
ae8ca44d25 Trying to use delete_role instead 2015-01-22 18:44:37 +01:00
Flavian
c48a2eb38a forgotten call=action 2015-01-22 18:28:07 +01:00
Flavian
85dd96466b get the service_name as being the deployment_name from show_instance, 
deletes the vm and then waits for the async operation to be finished
 2015-01-22 18:26:30 +01:00
Flavian
2845f9c738 fixed show_instance with the new list_nodes_full 2015-01-22 18:09:44 +01:00
Flavian
ca293bc6ff Changed deployment name to service name in destroy for azure 2015-01-22 18:03:17 +01:00
Flavian
815338ed26 Removed a statement where stopped machines couldn't be deleted from a 
map
 2015-01-22 17:56:58 +01:00
Flavian
202df84e04 Fixes state name in list nodes full 2015-01-22 17:51:24 +01:00
Flavian
8ccba662ea Invert deployment and role in the dict returned by list_nodes_full 2015-01-22 11:56:00 +01:00
Joseph Hall
ac4bc04835 Merge pull request #19939 from s0undt3ch/2015.2 
White-space lint fix
 2015-01-21 18:26:47 -07:00
Pedro Algarvio
88ef44f04f White-space lint fix 2015-01-22 01:21:28 +00:00
Thomas S Hatch
8e9c34705a Merge pull request #19922 from thatch45/output_fallback 
single out the output fallback routine
 2015-01-21 13:56:25 -07:00
Thomas S Hatch
37619f0e0c Add log message for bad outputter 2015-01-21 13:05:02 -07:00
Thomas S Hatch
a44bdb6e2b Generalize the fallback wrapper 2015-01-21 13:00:41 -07:00
Thomas S Hatch
b6faad4bdc Merge pull request #19913 from basepi/merge-forward-2015.2 
Merge forward from 2014.7 to 2015.2
 2015-01-21 12:03:08 -07:00
Thomas S Hatch
7ed5186a4e Merge pull request #19910 from s0undt3ch/hotfix/create-parent-dirs-2015.2 
[2015.2] create parent dirs
 2015-01-21 11:56:00 -07:00
Colton Myers
098c39596a Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
	salt/templates/rh_ip/rh5_eth.jinja
	salt/templates/rh_ip/rh6_eth.jinja
	salt/utils/templates.py
 2015-01-21 11:19:06 -07:00
Thomas S Hatch
83591dff8f Merge pull request #19909 from s0undt3ch/hotfix/create-parent-dirs 
Create parent directories
 2015-01-21 10:57:58 -07:00
Thomas S Hatch
938af03520 Merge pull request #19902 from jfindlay/fix_blkid 
test for blkid before running disk.blkid
 2015-01-21 10:57:37 -07:00
Thomas S Hatch
067577288f Merge pull request #19906 from techhat/verifyssl 
Allow SSL verification to be turned off
 2015-01-21 10:41:55 -07:00
Thomas S Hatch
678c57f414 Merge pull request #19907 from techhat/httpdocs 
Update HTTP tutorial for new functionality
 2015-01-21 10:41:34 -07:00
Pedro Algarvio
1183eb1a93 Make sure parent directories are also created 2015-01-21 17:19:48 +00:00
Pedro Algarvio
82b2b723a1 Create parent directories 2015-01-21 17:19:19 +00:00
Joseph Hall
dcf6304f0d Use syspaths 2015-01-21 10:17:57 -07:00
Pedro Algarvio
b837c3bc81 Create parent directories 2015-01-21 17:17:14 +00:00
Nicole Thomas
18fc519270 Merge pull request #19905 from techhat/joyent-2015.2 
Modify how joyent driver handles SSL and URLs
 2015-01-21 09:41:35 -07:00
Joseph Hall
483e84c78a Update HTTP tutorial for new functionality 2015-01-21 09:20:11 -07:00
Joseph Hall
b8a531a955 Allow SSL verification to be turned off 2015-01-21 08:55:11 -07:00
Joseph Hall
667473c72c Modify how joyent driver handles SSL and URLs 2015-01-21 08:29:06 -07:00
Nicole Thomas
ab725d5c7a Merge pull request #19904 from rallytime/pylint_dot_seven 
Fix pylint errors on 2014.7
 2015-01-21 08:24:29 -07:00
rallytime
4a6f78821f Fix pylint errors on 2014.7 2015-01-21 08:23:45 -07:00
Justin Findlay
192ccc7373 test for blkid before running disk.blkid 2015-01-21 07:45:17 -07:00
Thomas S Hatch
80f9267fca Merge pull request #19885 from whiteinge/rest_cherrypy-token-error 
Also catch TokenAuthenticationError tracebacks to properly raise a 401
 2015-01-20 17:35:09 -07:00
Thomas S Hatch
30b874525d Merge pull request #19889 from basepi/merge-forward-2015.2 
Merge forward from 2014.7 to 2015.2
 2015-01-20 17:33:41 -07:00
Colton Myers
a9b42e4be3 Spaces after commas 2015-01-20 16:18:08 -07:00
Thomas S Hatch
e62ddb5afa Merge pull request #19881 from cachedout/issue_19807 
Fixup returner handling.
 2015-01-20 16:12:22 -07:00
Thomas S Hatch
0e679b6d7e Merge pull request #19880 from whiteinge/msazure-dep-docs 
Added depends section to Azure cloud module docstring
 2015-01-20 16:11:46 -07:00
Thomas S Hatch
cd78d8a933 Merge pull request #19873 from Trax-air/fix-show_instance 
Fixes #19597 - show_instance now shows the cloud_service dictionary under which the instance can be found
 2015-01-20 16:09:47 -07:00
Thomas S Hatch
702e248b6c Merge pull request #19865 from kev009/freebsd-ssd-grain 
Add FreeBSD support to ssds grain
 2015-01-20 16:07:04 -07:00
Thomas S Hatch
602b1a34aa Merge pull request #19862 from kev009/freebsd-kmods 
Add freebsdkmod changes to 2014.7.2 relnotes
 2015-01-20 16:06:17 -07:00
Thomas S Hatch
275ac80446 Merge pull request #19835 from The-Loeki/fix_rh_mtu 
Fix MTU setting in network.managed for RH systems
 2015-01-20 15:48:06 -07:00
Colton Myers
bd83ad6d0d Use six.iteritems 2015-01-20 15:44:11 -07:00
Thomas S Hatch
1d5e8b5aaa Merge pull request #19826 from jfindlay/sdecode_jinja 
properly decode jinja rendering, fixes #19173
 2015-01-20 15:36:58 -07:00
Colton Myers
88fb2e0036 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
	doc/topics/tutorials/starting_states.rst
	salt/modules/linux_lvm.py
 2015-01-20 15:19:53 -07:00
Colton Myers
639c84e833 Merge pull request #19887 from basepi/defaultdatayamldocs 
Fix code block explanation in starting states tutorial
 2015-01-20 15:05:32 -07:00
Colton Myers
1fb6fc0ba1 Fix the explanation of the Default Data - YAML section of starting states 2015-01-20 15:03:54 -07:00
Thomas S Hatch
ba505e4680 Merge pull request #19825 from jfindlay/fix_lvcreate 
remove redundant code, append extra_arguments to cmd
 2015-01-20 14:55:21 -07:00
Thomas S Hatch
ef3d51c0f6 Merge pull request #19820 from highlyunavailable/feature/2014.7_fix_file_recurse_windows 
Force roots fileclient on Masterless Windows to return fake POSIX/"url"
 2015-01-20 14:53:53 -07:00
Thomas S Hatch
ef8e457360 Merge pull request #19886 from thatch45/pedro_doh 
@s0undt3ch copy pasta breaks pillar!
 2015-01-20 14:41:32 -07:00
Thomas S Hatch
c2be438803 @s0undt3ch copy pasta breaks pillar! 2015-01-20 14:40:20 -07:00