valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
82,044 Commits 24 Branches 182 Tags 341 MiB
b500fe4dd4
Commit Graph

82044 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andreas Tsaridas
b500fe4dd4 changes requested 2017-05-31 12:40:54 +02:00
Andreas Tsaridas
32450910e5 change error message 2017-05-29 21:47:12 +02:00
Andreas Tsaridas
195c063b1e clear jobs directories 2017-05-29 11:48:38 +02:00
Mike Place
e74f6241c1 Merge pull request #41264 from hrumph/regfile_read 
Addition of import_from_regfile function to reg execution module
 2017-05-19 14:04:29 -05:00
Mike Place
3d142213b0 Merge pull request #41304 from mcdermj/proxy-systemd-fix 
salt-proxy:  Fix systemd unit file to handle more proxy names
 2017-05-19 13:28:20 -05:00
Mike Place
691a73dbf6 Merge pull request #41305 from arthtux/develop 
correct accept_vpc_peering_connection
 2017-05-19 13:26:49 -05:00
Mike Place
0d0f0d6d15 Merge pull request #41320 from shengis/azurerm_fix_show_interface 
Fix #41315 warnings on Azure provisioning when public ip disabled
 2017-05-19 13:21:13 -05:00
Mike Place
cfa0df6c87 Merge pull request #41323 from bodhi-space/infra4800 
INFRA-4800 - fix tagging logic in boto_asg module
 2017-05-19 13:13:24 -05:00
Mike Place
4c10545616 Merge pull request #41324 from bebehei/bash-completion 
Fix bash completion
 2017-05-19 13:12:50 -05:00
Mike Place
ebd8376ef4 Merge pull request #41328 from jpautler/dev/jpautler/hwclock_nilinuxrt_support 
Update timezone get/set_hwclock for NILinuxRT systems
 2017-05-19 13:04:21 -05:00
Mike Place
f39a78be1a Merge pull request #41344 from MalloZup/fix-doc-rpm-distros 
FIX Documentation about RPM Based distros.
 2017-05-19 12:47:13 -05:00
Mike Place
940bc2bedf Merge pull request #41331 from skizunov/develop2 
opkg: Add `failhard` param to refresh_db
 2017-05-19 12:46:13 -05:00
Mike Place
f91a866a17 Merge pull request #41334 from bodhi-space/infra4741 
Tiny fix to boto_iam.policy_absent
 2017-05-19 12:43:21 -05:00
dmaiocchi
4ae0e21a9b FIX Documentation about RPM Based distros. 
There is no YUM based distro(even the last fedora is based on dnf), so
the correct documentation is RPM.
 2017-05-19 17:22:14 +02:00
Tom Williams
d52587e48a INFRA-4741 - Tiny fix to boto_iam.policy_absent 2017-05-18 22:55:31 -04:00
Sergey Kizunov
af833ca212 opkg: Add failhard param to refresh_db 
This is done for similar reasons as PR #37910 which modifies
the `aptget.py` module to add the same parameter to `refresh_db`. Use
similar comments and coding style.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
 2017-05-18 15:25:43 -05:00
Mike Place
5406a7cdd4 Merge pull request #41314 from Lex-Persona/fix-glassfish-test 
Fix glassfish state module
 2017-05-18 11:55:35 -05:00
Mike Place
e6dabdbf6e Merge pull request #41307 from lomeroe/fix_41306 
properly pack/unpack the verison numbers into a number
 2017-05-18 11:53:31 -05:00
Benedikt Heine
d54b893b71 convert whitespace tabs to spaces 2017-05-18 18:53:27 +02:00
Tom Williams
3467b2740a INFRA-4800 - fix tagging logic in boto_asg module 2017-05-18 12:53:15 -04:00
Benedikt Heine
df290b7b09 expand tilde correctly in bashcompletion (fixes #41302) 2017-05-18 18:48:12 +02:00
Aurélien FUSIL-DELAHAYE
f4f6b4bb2e Fix #41315 warnings on Azure provisioning when public ip disabled 2017-05-18 18:14:33 +02:00
Mike Place
d66ffa2474 Merge pull request #41235 from moio/rest-cherrypy-remove-sleep 
rest_cherrypy: remove sleep call
 2017-05-18 11:02:12 -05:00
Mike Place
8386d10b4b Merge pull request #41192 from DSRCorporation/features/executors_redesign_doc 
Executors redesign and documentation
 2017-05-18 10:42:20 -05:00
Mike Place
3c80f6c362 Merge pull request #41318 from Ch3LL/update_latest_develop 
[develop] Bump latest release version to 2016.11.5
 2017-05-18 10:33:55 -05:00
Jeffrey Pautler
08e8f08999 Make os_family check more concise 2017-05-18 09:53:25 -05:00
Ch3LL
c18dff225f
[develop] Bump latest release version to 2016.11.5 2017-05-18 09:38:00 -04:00
Jason Fagnere
c370c659d4 Fix glassfish when test=true and AS server down 2017-05-18 14:23:36 +02:00
root
e17abeaf43 Fix typo 2017-05-18 02:01:56 -04:00
root
88593d1a23 Changed name of function to import_file 2017-05-18 01:46:43 -04:00
Jeffrey Pautler
6254b8f326 Update set_hwclock to only accept UTC on NILinuxRT 
NILinuxRT systems do not support non-UTC timezones for hwclock, so
enforce that in set_hwclock.
 2017-05-17 16:44:44 -05:00
lomeroe
91bfa6d9fe properly pack/unpack the verison numbers into a number 2017-05-17 14:46:30 -05:00
Mike Place
529dbbe6bb Merge pull request #41213 from pcn/slack-client-features 
Slack client features
 2017-05-17 14:36:47 -05:00
Mike Place
4ed45d9dcc Merge pull request #41281 from alexbleotu/root_dir_prepend_fix-gh 
Root dir prepend fix gh #2
 2017-05-17 14:10:26 -05:00
Mike Place
bf7b0cce2f Merge pull request #41229 from Jille/develop 
Add support for ssh certificates to salt.modules.ssh.host_keys
 2017-05-17 14:09:56 -05:00
Mike Place
a16cfe2c10 Merge pull request #41246 from keesbos/catch-grain-mock-error 
Catch a possible error, especially triggered in unit tests
 2017-05-17 13:48:55 -05:00
Mike Place
9d9bf1c7f6 Merge pull request #41247 from mcdermj/develop 
JunOS: Change os_install to use get_file instead of get_template
 2017-05-17 13:46:15 -05:00
Mike Place
c51a6e4757 Merge pull request #41270 from isbm/isbm-minion-id-127-name-devel 
Bugfix: Unable to use "127" as hostname for the Minion ID (devel)
 2017-05-17 13:29:03 -05:00
Mike Place
1c3741eae1 Merge pull request #41284 from shengis/azurerm_load_balancers 
Add support for load balancers with AzureARM provider
 2017-05-17 13:24:58 -05:00
Arthur Deschamps
0391490ee4 correct accept_vpc_peering_connection 2017-05-17 14:11:10 -04:00
Jeremy McDermond
72ce923fa1 salt-proxy: Fix systemd unit file to handle more proxy names 
The current systemd unit file uses %I which gives the unescaped argument
to the script.  This breaks if there are special characters in the proxy
name such as '-'.  Using %i escapes the name when it's handed to the command
line allowing the use of those characters.

This change also adds the argument to the template to the unit name so that
it's a bit easier to see in systemctl.
 2017-05-17 11:01:48 -07:00
Mike Place
1d89454fd8 Merge pull request #41285 from kraney/boto_lambda_vpc_reset 
fix a bug in boto_lambda state where if VpcConfig is None or absent, …
 2017-05-17 11:55:58 -05:00
Mike Place
eecf2a81b7 Merge pull request #41288 from liquidgecka/develop 
Only deal with integer bits in win_service.py.
 2017-05-17 11:54:36 -05:00
Mike Place
f56c634458 Merge pull request #41290 from mcdermj/junos-proxy-alive 
JunOS:  Add alive function to proxy
 2017-05-17 11:48:46 -05:00
Mike Place
e3b0d5cd17 Merge pull request #41292 from rallytime/merge-develop 
[develop] Merge forward from nitrogen to develop
 2017-05-17 11:48:26 -05:00
Mike Place
36269d2601 Merge pull request #41295 from shengis/azurerm_availability_set 
Add support for availibility_set
 2017-05-17 11:37:34 -05:00
Mike Place
ecaf7dde5d Merge pull request #41297 from defanator/boto_vpc_route_table_present_test_fix 
boto_vpc.route_table_present: avoid exception in testing mode
 2017-05-17 11:35:57 -05:00
Mike Place
3d10884578 Merge pull request #41301 from lomeroe/fix_41291 
properly convert packed string to decimal values
 2017-05-17 11:33:07 -05:00
Alexandru Bleotu
00d0c37e0a Fixed prepend logic #2 2017-05-17 17:21:15 +01:00
Alexandru Bleotu
f5af299240 pylint fixes 2017-05-17 17:21:15 +01:00