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
44,525 Commits 24 Branches 182 Tags 341 MiB
185856ddbb
Commit Graph

2111 Commits

Author SHA1 Message Date
Thomas S Hatch
5affea1022 Merge branch '2015.2' into beacons 2015-01-26 16:57:43 -07:00
Thomas S Hatch
828906d62d Merge branch '2015.2' into beacons 2015-01-25 09:26:43 -07:00
Thomas S Hatch
54529a9aa2 Add initial documentation 2015-01-23 23:11:34 -07:00
Pedro Algarvio
cdbbe4c0dd Fix typos 2015-01-24 03:16:52 +00:00
Mike Place
b8e9249c80 Added docs for Lithium deprecations 2015-01-24 03:16:49 +00:00
Colton Myers
9e9a2eab90 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
	salt/fileserver/gitfs.py
	salt/loader.py
 2015-01-23 16:13:30 -07:00
Thomas S Hatch
55cb7fdab1 Merge pull request #20015 from basepi/grainsprecedencedocs19611 
Fix grains precedence issues
 2015-01-23 15:40:32 -07:00
Colton Myers
f609366dee Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
	doc/conf.py
 2015-01-22 16:53:22 -07:00
Colton Myers
f1e7661973 Release 2014.7.1 (docs sidebar and release date for release notes) 2015-01-22 16:52:21 -07:00
Colton Myers
079e20a536 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 2015-01-22 16:48:27 -07:00
Colton Myers
63195007d6 Merge pull request #19980 from rallytime/update_windows_release_docs 
Add 2014.7.1 release to Windows Installation Docs
 2015-01-22 16:48:15 -07:00
Colton Myers
c1e630340e Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
	salt/fileserver/gitfs.py
	salt/grains/core.py
 2015-01-22 16:46:32 -07:00
robert.fach
4f7b0a29d1 updated information regarding required version for dulwich gitfs backend 2015-01-22 17:14:27 +01:00
Colton Myers
a067e6ceba Fix the grains precedence documentation 
Fixes #19611
 2015-01-21 16:10:18 -07:00
Colton Myers
098c39596a Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
	salt/templates/rh_ip/rh5_eth.jinja
	salt/templates/rh_ip/rh6_eth.jinja
	salt/utils/templates.py
 2015-01-21 11:19:06 -07:00
Thomas S Hatch
678c57f414 Merge pull request #19907 from techhat/httpdocs 
Update HTTP tutorial for new functionality
 2015-01-21 10:41:34 -07:00
Joseph Hall
483e84c78a Update HTTP tutorial for new functionality 2015-01-21 09:20:11 -07:00
Joseph Hall
667473c72c Modify how joyent driver handles SSL and URLs 2015-01-21 08:29:06 -07:00
Thomas S Hatch
602b1a34aa Merge pull request #19862 from kev009/freebsd-kmods 
Add freebsdkmod changes to 2014.7.2 relnotes
 2015-01-20 16:06:17 -07:00
Colton Myers
88fb2e0036 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
	doc/topics/tutorials/starting_states.rst
	salt/modules/linux_lvm.py
 2015-01-20 15:19:53 -07:00
Colton Myers
1fb6fc0ba1 Fix the explanation of the Default Data - YAML section of starting states 2015-01-20 15:03:54 -07:00
rallytime
99e35ffb1e Add 2014.7.1 release to Windows Installation Docs 
Also remove the links to the 2014.7.0 exe's because of regressions.
 2015-01-20 12:21:57 -07:00
Kevin Bowling
494543c5bc Add freebsdkmod changes to 2014.7.2 relnotes 2015-01-20 02:09:32 -07:00
Colton Myers
d1b201e2bf Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
	salt/runners/manage.py
	salt/utils/cloud.py
 2015-01-15 16:20:48 -07:00
Joseph Hall
56a52f9552 Merge pull request #19752 from rallytime/remove_sshpass_checks 
Remove sshpass checks
 2015-01-15 15:12:00 -07:00
rallytime
4d5cc90c6a Remove sshpass checks from utils/cloud.py and other references 
Fixes #19219
 2015-01-14 23:08:00 -07:00
Colton Myers
228ada2890 Add release notes for 2014.7.2 2015-01-14 15:17:33 -07:00
Colton Myers
2e364ac249 Add more release notes for 2014.7.1 2015-01-14 15:17:21 -07:00
Colton Myers
2a6c9a8165 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
	doc/topics/ssh/index.rst
 2015-01-13 11:58:58 -07:00
David\ Beitey
839968f637 Expand documentation about Saltfile for salt-ssh 2015-01-13 16:50:29 +10:00
Colton Myers
3ce5eb2838 Merge branch '2014.7' into merge-forward-2015.2 
Conflicts:
	salt/modules/archive.py
	salt/modules/brew.py
	salt/modules/pip.py
	tests/unit/modules/archive_test.py
	tests/unit/modules/pip_test.py
 2015-01-09 11:39:09 -07:00
Mike Place
b419366443 Release note note 
Fixes #18551
 2015-01-08 16:41:20 -07:00
twellspring
f8883cebdd Add private subnets 
Added how to enable rackspace private subnets on servers instantiated by salt cloud
 2015-01-02 19:28:45 -08:00
Colton Myers
cc74c400b9 Add docs for mine in salt-ssh 2014-12-23 12:14:31 -07:00
Colton Myers
139bd8df5b Add salt-ssh mine to lithium release notes 2014-12-23 11:35:40 -07:00
Colton Myers
321413e638 Rename lithium release notes to 2015.2.0 2014-12-23 11:34:52 -07:00
Colton Myers
dc778a8e5e Merge branch '2014.7' into develop 
Conflicts:
	salt/client/ssh/__init__.py
	salt/states/boto_secgroup.py
 2014-12-23 10:57:26 -07:00
Colton Myers
f2fd892dc5 Merge pull request #19145 from whiteinge/sphinx-fixups 
Minor Sphinx fixups
 2014-12-22 16:25:01 -07:00
Colton Myers
7fc1cc2ba2 Merge branch '2014.7' into merge-forward 
Conflicts:
	doc/topics/releases/2014.7.1.rst
	salt/modules/mdadm.py
	salt/modules/mine.py
	salt/modules/win_firewall.py
	salt/modules/win_groupadd.py
	salt/modules/win_service.py
	salt/modules/win_system.py
	salt/modules/win_useradd.py
	salt/runners/jobs.py
	tests/unit/modules/mdadm_test.py
 2014-12-22 13:33:53 -07:00
rallytime
b43519b882 Update the windows package to correct one: 2014.7.0 --> 2014.7.0-1 
Fixes #19146
 2014-12-19 16:00:30 -07:00
Seth House
a8e8111c92 Add a cross-ref to the vmbuilder formula repo 2014-12-19 14:34:58 -07:00
Seth House
a33ae0655f Switch the :formula: extlink to :formula_url: 
The addition of the Salt domain conflicted with this role. Better to
rename this one to be more explicit and to save that real-estate for
future use.
 2014-12-19 14:34:57 -07:00
Colton Myers
9d5e05a381 Add more release notes for 2014.7.1 2014-12-18 14:19:52 -07:00
Thomas S Hatch
1dcc05b049 Merge branch '2014.7' into develop 
Conflicts:
	salt/modules/yumpkg.py
 2014-12-17 15:00:26 -07:00
Thomas S Hatch
45365c095e Merge pull request #19029 from basepi/merge-forward 
Merge forward from 2014.7 to develop
 2014-12-17 14:48:01 -07:00
Joseph Hall
bc58c569ab Update docs for impacket dep 2014-12-17 11:45:49 -07:00
rallytime
926c486587 Correct master_sign_key_name reference 
Fixes #19053
 2014-12-17 11:32:23 -07:00
Colton Myers
e0b6f1623c Add publish wrapper to lithium release notes 2014-12-16 16:13:03 -07:00
Colton Myers
fc16bd16c0 Merge branch '2014.7' into merge-forward 
Conflicts:
	doc/faq.rst
	doc/ref/states/compiler_ordering.rst
	doc/topics/best_practices.rst
	doc/topics/development/conventions/formulas.rst
	salt/config.py
	salt/modules/state.py
	salt/states/mount.py
	salt/utils/event.py
	tests/unit/utils/process_test.py
 2014-12-16 14:45:25 -07:00
Seth House
51fa87c446 Change all state examples to use short-dec format for consistency 
Closes #12419.

The command used to search the docs for state examples is below. This
generates a file in Vim's quickfix format that can be loaded with the -q
flag.

find . -type f \( -name '*.rst' -o -name '*.py' \) -print0
    | xargs -0 -P10 -n1 awk '
        BEGIN { RS=""; FS="\n" }
        { linenr = linect; linect += (NF + 1) }
        /^\s+[a-zA-Z0-9'\''_-]+:\n\s+[a-zA-Z0-9'\''_-]+:\n\s+- / {
            print FILENAME "|" linenr + 2 "|", $1
        }
    ' > ./salt-states.quickfix
 2014-12-12 23:36:40 -07:00