Commit Graph

55829 Commits

Author SHA1 Message Date
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
Nicole Thomas
5d4bdb191b Merge pull request #25289 from krak3n/fix/boto_sns_cred_subscription
Fix: Boto SNS - Auth Basic Endpoint Compare
2015-07-13 08:36:27 -06:00
Nicole Thomas
049bbaddff Merge pull request #25355 from kaidokert/develop
EC2 cloud: Fix another availability zone mismatch
2015-07-13 08:32:20 -06:00
Dmitry Kuzmenko
7430c6d71f Fix: minion doesn't set tok property in masters list case. 2015-07-13 17:13:58 +03:00
Ryan Lewis
2db37fb19d Fix init_bin being None from #20124 + #24531
When the minion is run as a user without privelidge to see the init
binary the minion will not start. i.e. normal user and init is in /sbin/
 #24531 removed some paths from PATH which caused this to error in
 develop, if it is backported this should be as well.
2015-07-13 21:51:00 +12: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
c8f4d82fb5 Merge pull request #25353 from s0undt3ch/develop
Lint fixes to tests/modparser.py and some minor additions
2015-07-13 10:42:43 +01:00
Ted Strzalkowski
491de2df6c perform refresh_pillar as part of sync_all when refresh=True 2015-07-12 20:59:39 -07:00
Pedro Algarvio
2b14375b30 No empty docstrings 2015-07-12 19:26:33 +01:00
Pedro Algarvio
6294c67b12 Nicer handling of user keyboard interruption 2015-07-12 12:37:56 +01:00
Pedro Algarvio
0add87e7b9 Display the failed import reason 2015-07-12 12:30:24 +01:00
Pedro Algarvio
e6df8cbe24 Add allowed choices to output format.
Since we're using the print function, we can specify the file handler to
user and in this case we choose `sys.stderr`
2015-07-12 12:27:26 +01:00
Pedro Algarvio
ef75ea068c Lint fixes to tests/modparser.py 2015-07-12 12:22:28 +01:00
Pedro Algarvio
f00aa559e7 Merge pull request #25349 from thatch45/modparser
Add modparser script
2015-07-12 12:18:49 +01:00
Thomas S Hatch
50a55eca58 Add output options to modparser 2015-07-11 15:36:58 -06:00
Thomas S Hatch
3f282e21f1 Add modparser script 2015-07-11 15:25:36 -06:00
Justin Findlay
5840c2e06b Merge pull request #25316 from s0undt3ch/develop
Merge 2015.8 forward to develop
2015-07-11 13:29:53 -06:00
Arnold Bechtoldt
1eb978b609 Merge branch 'refactor_es_modules' of github.com:bechtoldt/salt into refactor_es_modules 2015-07-11 17:59:47 +02:00
Arnold Bechtoldt
f2f485dda4 remove log entry that was used for debugging only 2015-07-11 17:59:08 +02:00
Arnold Bechtoldt
60d818e872 improve profile mgmt 2015-07-11 17:59:08 +02:00
Arnold Bechtoldt
7d26e45979 raise exception in modules.elasticsearch when connection to ES cluster failed 2015-07-11 17:59:08 +02:00
Arnold Bechtoldt
af16c76422 refactor elasticsearch integration
* salt.modules.elasticsearch
* salt.states.elasticsearch*
* salt.returners.elasticsearch
2015-07-11 17:59:07 +02:00
Arnold Bechtoldt
5df0ffa1f6 remove log entry that was used for debugging only 2015-07-11 10:43:28 +02:00
Kaido Kert
18f7573bb6 EC2 cloud: Fix another availability zone mismatch, preventing cloud.profile state from working correctly 2015-07-10 20:09:59 -07:00
Benjamin Bergia
675a309e15 Add a method context containing the path 2015-07-11 10:12:24 +08:00
mikelodder7
9149dd3c9b Create sqlite3.py 2015-07-10 16:27:30 -06:00
Justin Findlay
01dfa10dee Merge pull request #25330 from jacobhammons/doc-updates
update latest version to 2015.5.3, bug fix in help system
2015-07-10 12:49:10 -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
Jacob Hammons
96c4fb61b8 update latest version to 2015.5.3, bug fix in help system 2015-07-10 10:56:37 -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
4066cf379c Merge pull request #25325 from jacobhammons/win-wua-doc
Add win_wua module to doc index
2015-07-10 10:11:08 -06:00
Jacob Hammons
859530397a Add win_wua module to doc index 2015-07-10 09:54:08 -06:00
Seth House
9548e385a5 Merge pull request #25286 from bbinet/pillarstack
add support for PillarStack ext_pillar
2015-07-10 09:51:17 -06:00
Arthur Lutz
2714c13696 pylint fixes 2015-07-10 17:38:38 +02:00
rallytime
c5811609be Put two boto_vpc functions on deprecation paths with warnings 2015-07-10 09:29:34 -06:00
rallytime
805041d4d0 Put data.getval and data.getvals on deprecation path with a warning 2015-07-10 09:29:34 -06:00
rallytime
7795670bdc Remove Beryllium Deprecation Warnings 2015-07-10 09:27:50 -06:00
rallytime
2b7d876c64 Put network.ip_in_subnet on deprecation path with a warning 2015-07-10 09:27:50 -06:00
Justin Findlay
7376ef426d Merge pull request #25309 from davidjb/patch-3
Format /etc/locale.gen correctly in salt.modules.localemod.gen_locale
2015-07-10 08:24:08 -06:00
Rafael Uzarowski
01dd2e0026 [cloud:EC2] Move SourceDest logic to _update_enis and add DeleteOnTermination alias for delete_interface_on_terminate 2015-07-10 12:58:03 +02:00
Chris Reeves
2f5ccfe518 Fixing lint error 2015-07-10 11:50:03 +01:00
Pedro Algarvio
7a796440c0 Merge remote-tracking branch 'upstream/2015.8' into develop 2015-07-10 11:16:48 +01:00
Pedro Algarvio
3b3dc78916 Merge pull request #25300 from s0undt3ch/features/raas-17-salt-cloud-2015.8
Fix ordering issue & Added requirements support
2015-07-10 11:15:38 +01:00