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
53,782 Commits 24 Branches 182 Tags 341 MiB
095979d0c2
Commit Graph

4494 Commits

Author SHA1 Message Date
rallytime
095979d0c2 Add digitalocean deprecation notice to Beryllium release notes 2015-05-29 14:50:22 -06:00
rallytime
c10453e844 Deprecate digital_ocean.py in favor of digital_ocean_v2.py 
The removes support for the original digital_ocean.py driver in salt-cloud
and replaces the original digital_ocean.py driver with the digital_ocean_v2.py
driver. The digital_ocean_v2.py driver is renamed to just digital_ocean.py.
 2015-05-29 14:32:42 -06:00
Aneesh Agrawal
82a4794e0f Do not reference serializers from aggregation docs. 2015-05-28 20:04:20 -04:00
Aneesh Agrawal
4b9311507c Add new module type for serializers from issue #22257. 
Move existing serializers from salt.utils.serializers to
salt.serializers.
 2015-05-28 20:03:11 -04:00
Nicole Thomas
fd41993022 Merge pull request #24157 from basepi/merge-forward-develop 
Merge forward from 2015.5 to develop
 2015-05-27 16:09:00 -06:00
Tyler Cipriani
8ec82b640d Update salt vagrant provisioner info 
Also tweaked one piece of confusing verbiage
 2015-05-27 11:13:29 -07:00
Colton Myers
60f2e9eefb Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    doc/topics/development/contributing.rst
    salt/modules/tls.py
 2015-05-26 16:38:42 -06:00
Justin Findlay
67c4373577 Merge pull request #24135 from rallytime/bp-24083 
Backport #24083 to 2015.5
 2015-05-26 09:58:27 -06:00
thanhnt
e1d06f9764 fix code block syntax 2015-05-26 08:57:46 -06:00
Justin Findlay
fa2d411f53 update example release branch in contrib docs 2015-05-25 23:06:39 -06:00
Justin Findlay
a0b76b57b3 clarify git rebase instructions 2015-05-25 23:05:23 -06:00
Justin Findlay
3517e0095f fix contribution docs link typos 2015-05-25 22:55:19 -06:00
Justin Findlay
651629c6a4 backport dev contrib doc updates to 2015.5 2015-05-25 22:54:54 -06:00
Nicole Thomas
0fcdb324c6 Merge pull request #24081 from jacobhammons/develop 
added custom search for each branch, fixed style issues
 2015-05-22 17:04:17 -06:00
thanhnt
01b546e6e8 fix code block syntax 2015-05-23 00:57:42 +07:00
Jacob Hammons
1e1eb2b3ea added custom search for each branch, fixed style issues 2015-05-22 11:53:33 -06:00
Colton Myers
58aed60838 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    salt/runners/lxc.py
 2015-05-21 11:27:52 -06:00
rallytime
113c6049f5 Update release note for 2015.5.1 2015-05-20 14:50:08 -06:00
Colton Myers
9dbafcc051 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    salt/cloud/clouds/digital_ocean_v2.py
    salt/modules/tls.py
 2015-05-20 11:59:59 -06:00
David Boucha
10338d0c54 Add links to Windows 2015.5.0-2 install downloads 2015-05-20 11:16:24 -06:00
David Boucha
b84f9756c5 updated Windows 2014.7.5-2 installer download link 2015-05-20 11:16:24 -06:00
Thomas S Hatch
63164900bd Merge pull request #23942 from jacobhammons/2015.5 
Updates to sphinx saltstack2 doc theme
 2015-05-20 09:43:54 -06:00
Drew Malone
fb0f1080dd Quick note on usability of 'include' statement. 2015-05-20 10:46:03 -04:00
Jacob Hammons
31023c8915 Updates to sphinx saltstack2 doc theme 2015-05-19 15:54:28 -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
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
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
jpic
a4bcd75171 Fixed wrong path in LXC cloud documentation 2015-05-19 18:54:07 +02: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
Jacob Hammons
f7eb70ca60 changed previous release to 2014.7.6 2015-05-18 17:40:50 -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
d8a60d6181 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    doc/topics/releases/index.rst
    salt/modules/saltutil.py
 2015-05-18 17:10:10 -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
dec153bcea Update the release notes index page 2015-05-18 17:06:27 -06:00
Colton Myers
49921b6cb2 Update the 2014.7.6 release notes with CVE details 2015-05-18 16:34:48 -06:00
dumol
379c09c3a5 Updated for SLES 12. 
Added updated instructions for latest SLES release, using the relevant repo.
 2015-05-18 13:11:42 -06:00
Nitin Madhok
2c13cf3302 Fixing more sphinx errors and warnings 2015-05-18 12:39:49 -04:00
Nitin Madhok
9dc1e0b3ae Fixing sphinx errors and warnings 2015-05-18 12:12:07 -04:00
Justin Findlay
bf62d43993 Merge pull request #23848 from dumol/patch-1 
Updated installation docs for SLES 12.
 2015-05-18 09:27:04 -06:00
dumol
06bed050ae Updated for SLES 12. 
Added updated instructions for latest SLES release, using the relevant repo.
 2015-05-18 13:13:37 +03:00
Jacob Hammons
46eb2655ee saltstack2 sphinx theme updates 2015-05-17 20:39:24 -06:00
Jacob Hammons
e7442d3b1e Merge branch '2015.5' of https://github.com/saltstack/salt into 2015.5 2015-05-17 20:38:45 -06:00
Nitin Madhok
12ea8f5c52 Fixing more sphinx/docs errors and warnings 2015-05-16 19:24:04 -04:00
Jacob Hammons
ee3c1bd4a7 missed one 2015-05-15 16:26:47 -06:00
Jacob Hammons
3872921dd0 More updates to sphinx2 theme 2015-05-15 16:26:11 -06:00
Colton Myers
4ea3f8f80a Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    salt/pillar/neutron.py
    salt/utils/http.py
 2015-05-15 13:43:40 -06:00
Thomas S Hatch
d951bc8ad4 Merge pull request #22548 from terminalmage/docker-ng 
Add docker-ng state module
 2015-05-15 12:09:58 -06:00
Justin Findlay
94f9099307 Merge pull request #23723 from rallytime/bp-23568 
Backport #23568 to 2015.5
 2015-05-14 13:34:11 -06:00
Joseph Hall
bbec34abd3 Allow Salt Cloud to use either SCP or SFTP, as configured 2015-05-14 10:49:20 -06:00