valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
53,502 Commits 24 Branches 182 Tags 341 MiB
9dbafcc051
Commit Graph

53502 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TaiSHiNet
bbf2429bce Fixes droplet listing past page 1 
Affects creation and deletion (both failed if VM was outside page 1)
 2015-05-19 19:26:45 -06:00
Nitin Madhok
d458cfdf99 Fixing ImportError in salt 2014.7.0 version 2015-05-19 21:16:07 -04:00
Thomas S Hatch
3713834504 Merge pull request #23926 from DSRCompany/pillarenv 
Pillarenv support in minion config, cp and cmdmod modules.
 2015-05-19 18:47:37 -06:00
Thomas S Hatch
529e17196a Merge pull request #23906 from gladiatr72/exception_handler_for_Depends_decorator 
Added exception handler to trap the RuntimeError raised when
 2015-05-19 18:46:48 -06:00
Ryan Lane
e225333446 Update file.py 2015-05-19 17:33:14 -07:00
Ryan Lane
6347b3c363 Do not check perms in file.copy if preserve 2015-05-19 17:30:35 -07:00
Colton Myers
02a78fce3d Merge pull request #23940 from basepi/merge-forward-2015.5 
[2015.5] Merge forward from 2014.7 to 2015.5
 2015-05-19 16:37:57 -06:00
Thomas S Hatch
31244086cc Merge pull request #23930 from garethgreenaway/beacon_module_updates_to_list_function 
updates to beacons module
 2015-05-19 16:22:41 -06:00
Ryan Lane
da8d3849e5 Add missing loginclass argument to _changes call 2015-05-19 15:01:08 -07:00
Jacob Hammons
31023c8915 Updates to sphinx saltstack2 doc theme 2015-05-19 15:54:28 -06:00
Justin Findlay
ee4c01bf30 Merge pull request #23932 from rallytime/bp-23908 
Backport #23908 to 2015.5
 2015-05-19 15:41:28 -06:00
Justin Findlay
70bd407920 Merge pull request #23931 from rallytime/bp-23880 
Backport #23880 to 2015.5
 2015-05-19 15:41:18 -06:00
Colton Myers
36f0065faf Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 
Conflicts:
    salt/client/ssh/wrapper/pillar.py
 2015-05-19 15:23:37 -06:00
Colton Myers
913391207a Merge pull request #23939 from basepi/v2014.7.6release 
Add extended changelog to 2014.7.6 release notes
 2015-05-19 15:21:00 -06:00
Colton Myers
32b65dc2a9 Add extended changelog to 2014.7.6 release notes 2015-05-19 15:18:29 -06:00
Colton Myers
8f53adb4e6 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    salt/modules/lxc.py
 2015-05-19 15:12:54 -06:00
Colton Myers
5bdbf0af9b Merge pull request #23898 from makinacorpus/lxc_profiles 
Lxc profiles
 2015-05-19 15:08:28 -06:00
Joe Julian
30102acd04 Fix py3 and ordering inconsistency problems. 2015-05-19 13:50:14 -07:00
Joseph Hall
7c4b8cd125 Set cookie domain to string if None 2015-05-19 13:42:56 -06:00
Justin Findlay
b818f72dce Merge pull request #23922 from garethgreenaway/23900_2015_5_bonding_interface_fixes 
Fixes to debian_ip.py
 2015-05-19 12:50:53 -06:00
nleib
5d520c9377 fix connection function to mongo 
connecting to mongo using "pymongo.connection.Connection" did not work on different versions of mongo.
this change fixes the connection issue.
 2015-05-19 12:42:16 -06:00
Bastiaan Bakker
8ce59a2e16 if setting client_config_dir to '~', expand path 2015-05-19 12:40:43 -06:00
Mathieu Le Marec - Pasquet
d9051a047a lxc: systemd support 
This fixes #23847

Signed-off-by: Mathieu Le Marec - Pasquet <kiorky@cryptelium.net>
 2015-05-19 20:27:55 +02:00
Mathieu Le Marec - Pasquet
e8d674fed4 lxc: chroot fallback toggle 2015-05-19 20:27:55 +02:00
Mathieu Le Marec - Pasquet
e2887a0d44 lxc: sync func name with develop 2015-05-19 20:27:55 +02:00
Mathieu Le Marec - Pasquet
e96e345799 lxc more fixes (lxc.set_dns) 
This fixes #23833

Signed-off-by: Mathieu Le Marec - Pasquet <kiorky@cryptelium.net>
 2015-05-19 20:27:55 +02:00
Mathieu Le Marec - Pasquet
fdb64245d4 lxc: Fix salt config (no more a kwarg) 
Signed-off-by: Mathieu Le Marec - Pasquet <kiorky@cryptelium.net>
 2015-05-19 20:27:55 +02:00
Mathieu Le Marec - Pasquet
63e63fa527 repair salt cloud lxc api on develop 
Signed-off-by: Mathieu Le Marec - Pasquet <kiorky@cryptelium.net>
 2015-05-19 20:27:55 +02:00
Mathieu Le Marec - Pasquet
80eabe2703 lxc salt cloud doc 
Signed-off-by: Mathieu Le Marec - Pasquet <kiorky@cryptelium.net>
 2015-05-19 20:27:55 +02:00
Mathieu Le Marec - Pasquet
73f229d966 lxc: unificate saltconfig/master/master_port 
Signed-off-by: Mathieu Le Marec - Pasquet <kiorky@cryptelium.net>
 2015-05-19 20:27:55 +02:00
Mathieu Le Marec - Pasquet
0bc1f08a6b lxc: refactor a bit saltcloud/lxc interface 
Signed-off-by: Mathieu Le Marec - Pasquet <kiorky@cryptelium.net>
 2015-05-19 20:27:54 +02:00
Mathieu Le Marec - Pasquet
7a80370da9 lxc: get networkprofile from saltcloud 
Signed-off-by: Mathieu Le Marec - Pasquet <kiorky@cryptelium.net>
 2015-05-19 20:27:54 +02:00
Mathieu Le Marec - Pasquet
47acb2e159 lxc: default net profile has now correct options 
Signed-off-by: Mathieu Le Marec - Pasquet <kiorky@cryptelium.net>
 2015-05-19 20:27:54 +02:00
Mathieu Le Marec - Pasquet
7eadf4863c lxc: select the appropriate default bridge 
Signed-off-by: Mathieu Le Marec - Pasquet <kiorky@cryptelium.net>
 2015-05-19 20:27:54 +02:00
Justin Findlay
b1c98a38ed Merge pull request #23925 from jpic/fix/wrong_lxc_path 
Fixed wrong path in LXC cloud documentation
 2015-05-19 12:23:56 -06:00
Gareth J. Greenaway
5d60c0ff22 switching the list function in the beacon execution module to use an event to retrieve the list of beacons to ensure consistency when using salt vs salt-call 2015-05-19 11:13:32 -07:00
Joe Julian
493f7ad5f0 Validate keyword arguments to be valid 
If using a dereferenced dict to call create_ca_signed_cert the
**extensions kwargs will contain _all_ the kwargs. This causes errors
when dereferencing arguments.

This adds a test to ensure that the argument is the right type and
contains the right keys to be a valid extension.

Fixes issue 23872
 2015-05-19 10:58:50 -07:00
Colton Myers
622bda817f Merge pull request #23893 from basepi/merge-forward-develop 
Merge forward from 2015.5 to develop
 2015-05-19 11:23:15 -06:00
Justin Findlay
7f6a716a8a Merge pull request #23894 from whiteinge/doc-mock__all__ 
Add __all__ attribute to Mock class for docs
 2015-05-19 11:17:35 -06:00
Dmitry Kuzmenko
584c54abdf Added pillarenv support to cp module 2015-05-19 20:10:22 +03:00
Dmitry Kuzmenko
75291e0a22 Add pillarenv and pillar args to cmdmod module 2015-05-19 20:10:22 +03:00
Dmitry Kuzmenko
0eedf7ca2b Add 'pillarenv' into minion config. 2015-05-19 20:10:22 +03:00
Thomas S Hatch
7b0a5eac25 Merge pull request #23923 from terminalmage/issue23746 
Add warning about case-sensitivity in pkg states
 2015-05-19 10:59:52 -06:00
Thomas S Hatch
7550db2774 Merge pull request #23919 from gcamus/cron-unprivileged-user 
Manage user own cron with minion launch with unprivileged user
 2015-05-19 10:58:25 -06:00
jpic
a4bcd75171 Fixed wrong path in LXC cloud documentation 2015-05-19 18:54:07 +02:00
Stephen Spencer
878eb096c0 add proper marker for format argument 2015-05-19 11:36:58 -05:00
Thomas S Hatch
3a91f7ceb5 Merge pull request #23913 from makinacorpus/fixtls3 
tls: Open appropriatly tls serial file
 2015-05-19 09:57:19 -06:00
Thomas S Hatch
9d0d5d5c02 Merge pull request #23902 from lyft/kms-support 
Kms support
 2015-05-19 09:56:25 -06:00
Thomas S Hatch
22f54156f6 Merge pull request #23896 from The-Loeki/better-ipv6 
#22080 part 4: Make the related functions fully IP-agnostic
 2015-05-19 09:54:08 -06:00
Colton Myers
a87b057137 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    doc/ref/modules/all/salt.modules.slack_notify.rst
 2015-05-19 09:53:58 -06:00