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
55,807 Commits 24 Branches 182 Tags 341 MiB
12b8fd05d0
Commit Graph

55807 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
twangboy
52824f9602 Added /V1 /Z to remove scheduled task after run 2015-07-13 11:47:46 -06:00
twangboy
a055cca79f Changed date of scheduled task to work in other locales 2015-07-13 11:42:28 -06:00
Rafael Uzarowski
d9389ba8b4 Merge remote-tracking branch 'upstream/2015.8' into 2015.8-Move-SourceDestCheck-logic-to-_update_enis-to-make-it-work-with-prealloc-enis 2015-07-13 19:27:24 +02:00
Rafael Uzarowski
4eba749b07 Merge branch '2015.8-Move-SourceDestCheck-logic-to-_update_enis-to-make-it-work-with-prealloc-enis' of github.com:ruzarowski/salt into 2015.8-Move-SourceDestCheck-logic-to-_update_enis-to-make-it-work-with-prealloc-enis 2015-07-13 19:24:44 +02:00
Rafael Uzarowski
66f2ab5b2d [cloud:EC2] Move SourceDest logic to _update_enis and add DeleteOnTermination alias for delete_interface_on_terminate 2015-07-13 19:22:59 +02:00
Rafael Uzarowski
95aca7aaaa Fix CopyPaste error 2015-07-13 19:22:21 +02:00
Rafael Uzarowski
d80fc02c89 Fix lint errors 2015-07-13 19:22:20 +02:00
Rafael Uzarowski
7389619875 [cloud:EC2] Move SourceDest logic to _update_enis and add DeleteOnTermination alias for delete_interface_on_terminate 2015-07-13 19:22:20 +02:00
Rafael Uzarowski
d319038c2f Fix AttributeError in fileserver update_opts, as some func objects passed into loop do not have the func_globals attribute 2015-07-13 19:20:28 +02:00
Rafael Uzarowski
1ce48b1cac Merge branch '2015.8' of https://github.com/saltstack/salt into 2015.8 2015-07-13 19:16:34 +02:00
Mike Place
f64b32b309 Merge pull request #25264 from ruzarowski/2015.8-Fileserver-update_opts 
Fix AttributeError in fileserver update_opts
 2015-07-13 11:15:42 -06:00
Mike Place
274622ad9b Merge pull request #25334 from jfindlay/fix_zyp 
return all cmd info back to zypper fcn
 2015-07-13 11:03:29 -06:00
Mike Place
2a1dd1113f Merge pull request #25375 from cachedout/config_fix_2014_7 
Fix error in config.py for master_type
 2015-07-13 10:49:27 -06:00
Mike Place
c041f2905f Fix error in config.py for master_type 2015-07-13 10:48:51 -06:00
Mike Place
ae7138f61e Merge pull request #25372 from rallytime/fix-25228-provider 
Don't stacktrace when provisioning instances with softlayer* drivers
 2015-07-13 10:15:09 -06:00
Mike Place
71859c6593 Merge pull request #25339 from jfindlay/orch_doc 
update orchestration docs
 2015-07-13 10:04:25 -06:00
Rafael Uzarowski
50016f2a7a Merge branch '2015.8-Move-SourceDestCheck-logic-to-_update_enis-to-make-it-work-with-prealloc-enis' of github.com:ruzarowski/salt into 2015.8-Move-SourceDestCheck-logic-to-_update_enis-to-make-it-work-with-prealloc-enis 
Conflicts:
	salt/cloud/clouds/ec2.py
 2015-07-13 17:57:14 +02:00
Rafael Uzarowski
1ee4e48017 Fix CopyPaste error 2015-07-13 17:55:21 +02:00
Rafael Uzarowski
0489062ad3 Fix lint errors 2015-07-13 17:55:21 +02:00
Rafael Uzarowski
25272fecb5 [cloud:EC2] Move SourceDest logic to _update_enis and add DeleteOnTermination alias for delete_interface_on_terminate 2015-07-13 17:55:21 +02:00
Mike Place
90a1ca02a3 Merge pull request #25358 from dkiser/22241_pillar_merge_lists 
Deep merge of pillar lists
 2015-07-13 09:51:01 -06:00
jacobhammons
66c619fd71 Merge pull request #25346 from bechtoldt/issue25281 
set correct indention in states/requisites.rst (docs), fixes #25281
 2015-07-13 09:34:45 -06:00
rallytime
b9bf5304da Don't stacktrace when provisioning instances on softlayer_hw 2015-07-13 08:49:32 -06:00
rallytime
60391c97b5 Don't stacktrace when provisioning instances on softlayer 2015-07-13 08:48:22 -06:00
Nicole Thomas
0a0f8b0cf0 Merge pull request #25315 from ruzarowski/2015.8-EC2-ENI-Move-handling-of-AssociatePublicIpAddress-to-associate_eip-allocate_new_eip-logic 
[cloud:EC2] Move handling of AssociatePublicIpAddress to associate_eip/allocate_new_eip logic depending on value type
 2015-07-13 08:38:47 -06:00
Nicole Thomas
e5d7ba0b19 Merge pull request #25312 from ruzarowski/2015.8-Introduce-eni-Name-property-to-set-name-tag-value-after-its-creation 
[cloud:EC2] Introduce eni Name property to set name tag value after its creation
 2015-07-13 08:37:46 -06:00
Nicole Thomas
b16d86a1ec Merge pull request #25311 from ruzarowski/2015.8-Add-ability-to-attach-existing-interface 
[cloud:EC2] Add ability to attach an existing eni
 2015-07-13 08:37:18 -06:00
Andreas Lutro
6391b15b3e fix aptpkg.version_cmp 2015-07-13 16:09:16 +02:00
Gideon Redelinghuys
ea7ab27f31 Introduce standard error output when cli exits with non-zero status 2015-07-13 04:52:32 -07:00
Pedro Algarvio
2fe94b7cca Merge pull request #25280 from rallytime/beryllium_deprecations 
Remove deprecation warnings for Beryllium
 2015-07-13 10:46:42 +01:00
Pedro Algarvio
b122ed931d Merge pull request #25336 from terminalmage/fix-init-grain 
Don't try to read init binary if it wasn't found
 2015-07-13 10:45:30 +01:00
Justin Findlay
1805bafc89 Merge pull request #25350 from davidjb/patch-4 
Fix documentation for file.blockreplace
 2015-07-12 21:41:19 -06:00
Domingo Kiser
d030e289b3 Deep merge of pillar lists 2015-07-12 12:36:29 -07:00
David Beitey
e13a9fd74e Fix documentation for file.blockreplace 
Change marker_stop to marker_end & add formatting
 2015-07-12 10:59:16 +10:00
Arnold Bechtoldt
8eb2ac1dbe set correct indention in states/requisites.rst (docs), fixes #25281 2015-07-11 18:25:20 +02:00
Justin Findlay
0447808d95 clarify, motivate orchestration docs 2015-07-10 17:03:27 -06:00
Erik Johnson
f473918a53 Don't try to read init binary if it wasn't found 
This fixes an edge case where init_bin is None in certain environments
(such as the Fedora Buildsystem).
 2015-07-10 16:27:55 -05:00
Justin Findlay
c1e633903e return all cmd info back to zypper fcn 
Fixes #25320.
 2015-07-10 13:58:19 -06:00
Justin Findlay
b0196fccb7 Merge pull request #25326 from rallytime/bp-20972 
Back-port #20972 to 2015.5
 2015-07-10 12:49:44 -06:00
Justin Findlay
28450d124e Merge pull request #25327 from rallytime/bp-25290 
Back-port #25290 to 2015.5
 2015-07-10 12:49:37 -06:00
Justin Findlay
49fe23fb80 Merge pull request #25329 from twangboy/wua_documentation 
Fixed some documentation errors
 2015-07-10 12:24:13 -06:00
Rafael Uzarowski
5d6bcf62af Fix CopyPaste error 2015-07-10 19:55:38 +02:00
Justin Findlay
8f666a24f3 Merge pull request #25328 from rallytime/bp-25309 
Back-port #25309 to 2015.5
 2015-07-10 11:22:59 -06:00
twangboy
821595e4a3 Fixed some documentation errors 2015-07-10 10:41:56 -06:00
Rafael Uzarowski
2506585269 Use already allocated variable instead of calling getter twice 2015-07-10 18:19:37 +02:00
Rafael Uzarowski
fb93dd17c8 Fix lint errors 2015-07-10 18:13:09 +02:00
jacobhammons
2590e23d48 Merge pull request #25324 from jacobhammons/doc-theme-updates 
Latest help theme updates
 2015-07-10 10:11:31 -06:00
jacobhammons
0a33a1d8bb Merge pull request #25322 from jacobhammons/release-2015.5.3 
version change to 2015.5.3
 2015-07-10 10:11:24 -06:00
David Beitey
44d44ec574 Format /etc/locale.gen correctly on gen_locale 
Prior to this change, the ``file.replace`` call matches an end-of-line character, which changes a file from:
```
...
# en_US.UTF-8 UTF-8
# en_ZA ISO-8859-1
...
```
to
```
...
en_US.UTF-8 UTF-8# en_ZA ISO-8859-1
...
``` 
which is incorrectly formatted -- the newline char being removed means the whole section after the whitespace is considered the charset.  See http://www.man-online.org/page/5-locale.gen/.

This may fix #24827.
 2015-07-10 10:02:30 -06:00
René Jochum
20032c55f3 Simple fix for locale.present on Ubuntu. 
Signed-off-by: René Jochum <rene@jochums.at>
 2015-07-10 10:00:49 -06:00