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
48,126 Commits 24 Branches 182 Tags 341 MiB
85d461f748
Commit Graph

48126 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ryan Lane
85d461f748 Do not check perms in file.copy if preserve 2015-05-19 19:48:26 -06: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
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
5bdbf0af9b Merge pull request #23898 from makinacorpus/lxc_profiles 
Lxc profiles
 2015-05-19 15:08:28 -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
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
jpic
a4bcd75171 Fixed wrong path in LXC cloud documentation 2015-05-19 18:54:07 +02:00
Thomas S Hatch
8108a9bd19 Merge pull request #23884 from jfindlay/fix_locale 
Fix locale.set_locale on debian
 2015-05-19 09:51:22 -06:00
Thomas S Hatch
6bae12fa8b Merge pull request #23866 from jfindlay/flag_strip 
backport #23834, change portage.dep.strip_empty to list comprehension
 2015-05-19 09:50:42 -06:00
Nicole Thomas
0031ca2631 Merge pull request #23881 from garethgreenaway/23820_2014_7_schedule_list_issue 
Fixes to schedule module in 2014.7
 2015-05-19 09:46:30 -06:00
Justin Findlay
a67a008913 Merge pull request #23917 from corywright/issue23904 
Split debian bonding options on dash instead of underscore
 2015-05-19 09:44:35 -06:00
Justin Findlay
e8fcd0994d Merge pull request #23909 from jayeshka/file-exe-module 
'str' object has no attribute 'capitalized'
 2015-05-19 09:41:53 -06:00
Gareth J. Greenaway
0bba536d6d Fixing issue reported when using bonded interfaces on Ubuntu. Attributes should be bond-, but the code was attempting to split just on bond_. Fix accounts for both, but the debian_ip.py module will write out bond attributes with bond- 2015-05-19 08:28:57 -07:00
Cory Wright
c06f8cf831 Split debian bonding options on dash instead of underscore 
Fixes #23904
 2015-05-19 10:31:58 -04:00
Jayesh Kariya
e422d9d200 'str' object has no attribute 'capitalized' 2015-05-19 17:25:16 +05:30
Thomas S Hatch
c73bf38927 Merge pull request #23903 from garethgreenaway/missing_docs_schedule_state 
Adding docs for missing schedule state module parameters.
 2015-05-19 00:29:34 -06:00
Gareth J. Greenaway
acd8ab9e1d Adding docs for missing schedule state module parameters. 2015-05-18 22:33:50 -07:00
Jacob Hammons
f7eb70ca60 changed previous release to 2014.7.6 2015-05-18 17:40:50 -06:00
Jacob Hammons
608059f4bb Merge branch '2015.5' of https://github.com/jacobhammons/salt into 2015.5 2015-05-18 17:34:38 -06:00
Seth House
6eeca46158 Add __all__ attribute to Mock class for docs 2015-05-18 17:23:33 -06:00
Colton Myers
ff3cc7d331 Merge pull request #23806 from makinacorpus/lxc_seeding 
Lxc seeding
 2015-05-18 17:18:33 -06:00
Colton Myers
63bd21ecd2 Merge pull request #23887 from basepi/salt-ssh.pillar.get.22131 
[2014.7] Bring salt-ssh pillar.get in line with mainline pillar.get
 2015-05-18 17:11:34 -06:00
Jacob Hammons
a56697bd6e Merge branch '2015.5' of https://github.com/saltstack/salt into 2015.5 2015-05-18 17:11:29 -06:00
Colton Myers
5f1a93d966 Merge pull request #23892 from basepi/merge-forward-2015.5 
[2015.5] Merge forward from 2014.7 to 2015.5
 2015-05-18 17:07:57 -06:00
Colton Myers
c2eed77691 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 2015-05-18 17:07:15 -06:00
Colton Myers
17c5810c04 Merge pull request #23891 from basepi/releasenotes 
Update the release notes index page
 2015-05-18 17:06:52 -06:00
Colton Myers
dec153bcea Update the release notes index page 2015-05-18 17:06:27 -06:00
Jacob Hammons
1c2af5c685 Merge branch '2015.5' of https://github.com/saltstack/salt into 2015.5 2015-05-18 16:42:06 -06:00
Colton Myers
a93e58f80f Merge pull request #23888 from basepi/v2014.7.6release 
Update the 2014.7.6 release notes with CVE details
 2015-05-18 16:35:51 -06:00
Colton Myers
49921b6cb2 Update the 2014.7.6 release notes with CVE details 2015-05-18 16:34:48 -06:00
Justin Findlay
66d13356b3 Merge pull request #23875 from rallytime/bp-23838 
Backport #23838 to 2015.5
 2015-05-18 16:28:55 -06:00