valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
49,620 Commits 24 Branches 182 Tags 341 MiB
adb8d5c718
Commit Graph

4153 Commits

Author SHA1 Message Date
Seth House
37017a54be Replace doc examples for event.fire_master with event.send 2015-02-12 17:28:21 -07:00
Seth House
f0b5ddb77d Updated Reactor docs to reference state.event instead of eventlisten 
Easier than downloading an external script.
 2015-02-12 17:24:22 -07:00
Nicole Thomas
f82183d13d Merge pull request #19235 from terminalmage/lxc-refactor 
LXC Refactor
 2015-02-12 17:16:52 -07:00
Arnold Bechtoldt
cca2563fdf set appropriate headline for release notes of 2015.2.0 2015-02-12 23:33:37 +01:00
Seth House
3e6e6f367b Merge remote-tracking branch 'upstream/2014.7' into 2015.2 2015-02-12 14:53:13 -07:00
jfindlay
b898539e49 Merge pull request #20641 from whiteinge/doc-events 
Updated the event docs with the current Python API and more examples
 2015-02-12 12:53:01 -07:00
dsumsky
6d797f50d4 - log_level_logfile and log_level configuration options inheritance docu updated 2015-02-12 19:47:59 +01:00
Colton Myers
b2a80b195e Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 2015-02-12 11:44:57 -07:00
Seth House
7de5f9db8d Updated the event docs with the current Python API and more examples 2015-02-12 11:36:12 -07:00
rallytime
3f9af9f7d3 Change the release notes title to 2014.7.2 2015-02-12 11:26:17 -07:00
rallytime
3c2dd7d801 Change the releasecnadidates doc to reflect 2015.2.0rc1 2015-02-11 12:30:16 -07:00
rallytime
a42a5fb6d5 Add release candidate notification to docs sidebar 
v2015.2.0rc1
 2015-02-11 12:17:29 -07:00
jfindlay
a572be2ca3 Merge pull request #20594 from basepi/merge-forward-develop 
Merge forward from 2015.2 to develop
 2015-02-11 11:40:15 -07:00
Colton Myers
1e5bd7e1b8 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
	salt/client/mixins.py
	salt/fileserver/gitfs.py
	salt/loader.py
	salt/renderers/pyobjects.py
	salt/utils/args.py
	salt/utils/decorators/__init__.py
	salt/utils/lazy.py
	tests/integration/loader/globals.py
	tests/integration/loader/loader.py
 2015-02-11 09:17:35 -07:00
Dennis Hall
5cf8e389d4 Change Adjective in Starting States Tutorial 
The line which compares the previous two examples to the following YAML
example should use a demonstrative adjective like 'these'.
 2015-02-11 10:44:46 +01:00
Erik Johnson
89a58ac4c2 Update the LXC tutorial 
This updates the tutoral to reflect the new profile merging behavior.
 2015-02-10 15:06:47 -06:00
Erik Johnson
1530470339 No need to mention that Debian Jessie hasn't been released 2015-02-10 15:06:46 -06:00
Erik Johnson
93835d3f4e Hide set_pass from lxc state docs 2015-02-10 15:06:46 -06:00
Erik Johnson
10238f8be7 Add warnings about creating containers from rootfs image 2015-02-10 15:06:46 -06:00
Erik Johnson
1ea87ccaa9 Formatting tweak (for consistency) 2015-02-10 15:06:46 -06:00
Erik Johnson
a8fe526d20 Replace references to "next feature release" with 2015.2.0 2015-02-10 15:06:46 -06:00
Erik Johnson
832df20df2 Complete initial draft of LXC tutorial 
This will need to be filled out, but this is a good starting point.
 2015-02-10 15:06:45 -06:00
Erik Johnson
c4fc5f5fa4 More info for LXC tutorial 2015-02-10 15:06:45 -06:00
Erik Johnson
2dad71adc9 Add more info to LXC tutorial 2015-02-10 15:06:45 -06:00
Erik Johnson
728488e90b Tweak section header 2015-02-10 15:06:43 -06:00
Erik Johnson
196a7d6327 Stub for LXC tutorial 2015-02-10 15:06:43 -06:00
toppur
cdbaff63b7 Update formulas.rst 
There's not keyword named 'base' here, should be 'default'.
 2015-02-09 18:24:11 -08:00
Colton Myers
eba17606b4 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 2015-02-09 15:37:25 -07:00
Erik Johnson
3e321fdb48 Add file-locking bugfix to 2014.7.2 release notes 2015-02-09 11:32:20 -06:00
Arnold Bechtoldt
88dea95c6c add some cosmetic changes to the state requisites article 2015-02-07 18:46:03 +01:00
Seth House
60b960c33e Merge remote-tracking branch 'upstream/2015.2' into develop 2015-02-06 19:53:04 -07:00
Seth House
9a1a2db3aa Merge remote-tracking branch 'upstream/2014.7' into 2015.2 2015-02-06 19:52:23 -07:00
Seth House
bf6dfe823e Remove Mako from mocked deps for docs build 
If Mako was mocked for a reason originally, it doesn't seem to be needed
anymore. The docs build just fine with and without Mako installed.

Closes #9571 (at long last).
 2015-02-06 19:00:35 -07:00
Colton Myers
244c916b10 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
	salt/modules/cron.py
	salt/states/npm.py
 2015-02-06 15:41:21 -07:00
Colton Myers
56520f4ac9 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
	conf/minion
	salt/modules/cron.py
	salt/modules/pip.py
	salt/modules/tls.py
 2015-02-06 13:00:14 -07:00
Seth House
15936658ba Added cross-references to other ways to preseed minion keys 2015-02-05 19:15:46 -07:00
Justin Findlay
a44368001b fix pip venv regression, deprecate activate param 
Fixes #20191.  If `bin_env` points to a virtualenv, there is no need to
activate that virtualenv for pip to install into the virtualenv.  Also
update associated unit test.
 2015-02-05 12:36:42 -07:00
David Cournapeau
6847e054d8 DOC: add certifi to get proper https support. 2015-02-04 09:59:22 +00:00
Justin Findlay
b87615e277 document lowercase removal change 2015-02-03 16:27:41 -07:00
Nicole Thomas
9937702767 Merge pull request #20338 from pakdel/mssql 
MS SQL Execution module
 2015-02-03 14:03:31 -07:00
Amir Pakdel
eabb8a262c Added MS SQL execution module 2015-02-03 10:02:09 -05:00
Thomas S Hatch
e742d995ea Merge pull request #20332 from westurner/patch-2 
DOC: topics/tutorials/walkthrough.rst: then > than
 2015-02-03 06:20:10 -07:00
Thomas S Hatch
c192b365f5 Merge pull request #20313 from basepi/merge-forward-develop 
Merge forward from 2015.2 to develop
 2015-02-03 05:55:49 -07:00
Wes Turner
203f5c3798 DOC: topics/tutorials/walkthrough.rst: then > than 2015-02-03 05:42:50 -06:00
Colton Myers
068a23e390 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
	salt/daemons/flo/core.py
	salt/fileclient.py
	salt/utils/cloud.py
	salt/utils/schedule.py
 2015-02-02 15:27:43 -07:00
Diego Woitasen
e6f64019a8 How to store Minion config options on Pillars. 2015-02-02 09:27:13 -03:00
Colton Myers
ca6ecc0f0f Add only_upgrade to 2015.2 release notes 2015-01-30 16:07:39 -07:00
rallytime
9898fcf613 Merge branch '2015.2' into 'develop' 
Conflicts:
	.gitignore
	.pylintrc
	.testing.pylintrc
	salt/client/mixins.py
	salt/cloud/clouds/msazure.py
	salt/config.py
	salt/modules/mount.py
	salt/runners/doc.py
	salt/utils/event.py
	salt/utils/reactor.py
 2015-01-29 17:24:04 -07:00
rallytime
c65d9673a7 Merge branch '2014.7' into merge_forward_fifteen_second_try 
Conflicts:
	salt/states/file.py
 2015-01-29 13:42:49 -07:00
Joseph Hall
f5e8b4a10e Don't default CA bundle updates to a non-standard location 2015-01-28 20:09:13 -07:00
Thomas S Hatch
97285aadd0 Merge pull request #20152 from techhat/httpupdate 
Add function to update CA cert bundle
 2015-01-28 15:03:55 -07:00
Joseph Hall
f846925ba7 Document text_out and headers_out 2015-01-28 11:08:31 -07:00
Joseph Hall
d1746fa7fe Document updating CA bundles 2015-01-28 10:51:04 -07:00
Seth House
e3d29bf8ff Fixed syntax error in log_granular_levels example 2015-01-27 20:14:53 -07:00
rallytime
dc23823897 Merge branch '2014.7' into '2015.2' 
Conflicts:
	salt/modules/localemod.py
 2015-01-27 13:24:14 -07:00
rallytime
80bfa4a2a6 Add beacons section to 2015.2.0 release notes 2015-01-26 20:26:51 -07:00
Colton Myers
c4da7bdd64 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
	salt/client/mixins.py
	salt/daemons/flo/__init__.py
 2015-01-26 19:44:59 -07:00
Seth House
8e476bc455 Fixed typos in the beacon docs 2015-01-26 18:20:54 -07:00
Seth House
b777d3cba1 Added unique identifier for the beacon docs 2015-01-26 18:19:34 -07:00
Seth House
a26aef0d7d Added beacon module docs to the module index 2015-01-26 18:19:34 -07:00
Seth House
127ddb6d9c Added cross-references to the inotify beacon module 2015-01-26 18:19:34 -07:00
Thomas S Hatch
5affea1022 Merge branch '2015.2' into beacons 2015-01-26 16:57:43 -07:00
Shane D Lee
7c253f5ede Changed exe's to installers 2015-01-26 15:48:03 -07:00
Thomas S Hatch
bfc6ead3b0 Merge pull request #20039 from bechtoldt/doc_various_fixes 
completing some doc references
 2015-01-26 12:15:38 -07:00
Thomas S Hatch
5cc9a7c249 Merge pull request #20037 from bechtoldt/fix_19262 
add missing file_tree and virtkey in pillar index doc, refs #19262
 2015-01-26 12:15:02 -07:00
Colton Myers
a17c3716bd Merge remote-tracking branch 'upstream/2015.2' into develop 2015-01-26 10:16:37 -07:00
Thomas S Hatch
828906d62d Merge branch '2015.2' into beacons 2015-01-25 09:26:43 -07:00
Arnold Bechtoldt
439f253998 adding runners to doc salt.runners reference 2015-01-24 22:46:06 +01:00
Arnold Bechtoldt
4e72fdedb2 adding returners to doc salt.returners reference 2015-01-24 22:44:03 +01:00
Arnold Bechtoldt
2ad37d0bca adding renderers to doc salt.renderers reference 2015-01-24 22:41:54 +01:00
Arnold Bechtoldt
020ca989a3 adding output to doc salt.output reference 2015-01-24 22:38:28 +01:00
Arnold Bechtoldt
eeeff3b393 adding states to doc salt.states reference 2015-01-24 22:35:23 +01:00
Arnold Bechtoldt
7724073588 adding modules to doc salt.modules reference 2015-01-24 22:30:52 +01:00
Arnold Bechtoldt
73cbbf0e5f those files seem to be required, too 2015-01-24 21:51:45 +01:00
Arnold Bechtoldt
0ab5f51529 add missing file_tree and virtkey in pillar index doc, refs #19262 2015-01-24 21:43:32 +01: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
8bba4bbec4 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
	salt/cloud/clouds/msazure.py
	salt/modules/boto_sns.py
	salt/states/boto_sns.py
	tests/integration/modules/boto_sns.py
	tests/integration/states/boto_sns.py
 2015-01-23 14:20:34 -07:00
Thomas S Hatch
2e48f6a4ec Merge pull request #19967 from alxbse/win_repo_multiple_sources 
multiple source files in windows repo to fix saltstack/salt#9028
 2015-01-22 20:04:58 -07:00
jasonm-makerbot
64e816280a Update index.rst 
Correcting ordering of arguments, original way throws an error
 2015-01-22 19:16:44 -05: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
Alexander Backlund
e5c59deab3 added support for multiple source files in windows repo to fix saltstack/salt#9028 2015-01-22 11:55:33 -08: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
9446633e9d Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 2015-01-21 12:05:51 -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
Joseph Hall
27adbbe8aa Revert "Allow joyent api host suffix to be configurable" 2015-01-21 08:05:45 -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
Thomas S Hatch
dca509eb0d Merge pull request #19859 from twellspring/develop 
Documentation fix for Issue 19513.
 2015-01-20 16:06:03 -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
twellspring
e62e36dd57 Update include.rst 2015-01-19 21:02:26 -08:00
twellspring
59c67479ca Create sls_filename_cant_contain_period.rst 2015-01-19 20:56:49 -08:00
twellspring
cb2bfd6921 Update states_pt1.rst 2015-01-19 20:46:03 -08:00
twellspring
b78dff7011 Update starting_states.rst 2015-01-19 20:19:23 -08:00
Thomas S Hatch
1569520a4b Merge pull request #19792 from rallytime/merge_forward_develop 
Merge 2015.2 forward into develop
 2015-01-17 09:39:02 -07:00
Chris Rebert
19e262bb7b Fix typos with the help of https://github.com/vlajos/misspell_fixer 2015-01-16 13:35:47 -08:00
Todd Wells
99114eeeeb cloud timeout doc updates 2015-01-16 12:37:28 -08:00
rallytime
d724ed3a47 Merge branch '2015.2' into 'develop' 
Conflicts:
	salt/cli/batch.py
	salt/cloud/clouds/msazure.py
	tests/integration/netapi/rest_tornado/test_app.py
 2015-01-16 11:36: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
Thomas S Hatch
c070a57f8c Merge pull request #19744 from cachedout/doc_fix 
Remove a documentation surprise
 2015-01-14 16:18:15 -07:00
Mike Place
0ac3e624af Remove a documentation surprise 2015-01-14 15:28:40 -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
Erik Johnson
175ba127be Merge branch '2014.7' into 2014.7-2015.2 
Conflicts:
	salt/modules/archive.py
 2015-01-14 14:26:22 -06:00
Thomas S Hatch
4aae1ec9a4 Merge pull request #19713 from cachedout/runner_doc 
Some docs on runners
 2015-01-14 12:11:45 -07:00
rallytime
4a1a5123f2 Remove old --out options from salt-cloud docs 
Fixes #19453
 2015-01-13 21:39:27 -07:00
Mike Place
8284f0d6cc Some docs on runners 2015-01-13 16:26:59 -07:00
Nicole Thomas
63e207ee30 Merge pull request #19662 from basepi/merge-forward-develop 
Merge forward from 2015.2 to develop
 2015-01-13 15:23:09 -07:00
Colton Myers
8363db9d29 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 2015-01-13 12:09:56 -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
Joseph Hall
11d802d873 Allow joyent api host suffix to be configurable 2015-01-13 07:32:02 -07:00
David\ Beitey
839968f637 Expand documentation about Saltfile for salt-ssh 2015-01-13 16:50:29 +10:00
Aurynn Shaw
b7ae48642a Adds fire_master to the Salt Event library, for use in 3rd-party code. 2015-01-13 09:29:27 +13:00
Thomas S Hatch
bc74de81c6 Merge branch 'develop' of https://github.com/aurynn/salt into aurynn-develop 
Conflicts:
	doc/topics/ssh/roster.rst
 2015-01-12 11:36:24 -07:00
Aurynn Shaw
e1dbd4c07e Removes spurious text 2015-01-12 13:55:44 +13:00
Aurynn Shaw
7e4f5639ec Updates Salt SSH roster documentation, adding thin_dir and a note on setting persistent grains 2015-01-12 13:54:30 +13:00
Thomas S Hatch
cad85fd81b Merge pull request #19583 from basepi/merge-forward-develop 
Merge forward from 2015.2 to develop
 2015-01-09 17:49:43 -07:00
Thomas S Hatch
02251ae8fa Merge pull request #19582 from manonthemat/develop 
url fix of dependency in installation guide
 2015-01-09 17:47:46 -07:00
Mike Place
1b78f4069f Use __func_alias__ 2015-01-09 15:03:44 -07:00
Colton Myers
35596415b2 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
	salt/modules/brew.py
	salt/modules/disk.py
 2015-01-09 12:57:49 -07:00
manonthemat
e59f5b3b4d url fix 
http://docs.saltstack.com/en/latest/topics/installation/index.html linked to msgpack-python version 0.1.12. The fix links to the latest version (which is version 0.4.4 at the time of this commit), since not a specific version of msgpack-python was written down as a dependency.
 2015-01-09 11:27:32 -08: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
b5c0dbe0ed Cleanup jboss module 
Closes #18600
 2015-01-08 17:15:05 -07:00
Mike Place
b419366443 Release note note 
Fixes #18551
 2015-01-08 16:41:20 -07:00
Thomas S Hatch
0529136858 Merge pull request #19510 from JensRantil/sphinx-1.3b2 
doc(dev-bootstrap): Sphinx 1.3b2
 2015-01-08 09:57:42 -07:00
Jens Rantil
9e92864398 doc(dev-bootstrap): Sphinx 1.3b2 
I was getting an error that the current stable version of Sphinx wasn't
new enough. Installing Sphinx 1.3b2 did the trick.
 2015-01-08 08:04:11 +01:00
Thomas S Hatch
4713574a01 Merge pull request #19486 from s0undt3ch/merge/19161 
Merge #19161
 2015-01-07 16:06:24 -07:00
Thomas S Hatch
35af81b4b7 Merge pull request #19482 from JensRantil/warn-socketpath-early 
Development bootstrap documentation improvements
 2015-01-07 14:55:43 -07:00
Jens Rantil
30978b1070 doc(bootstrap-dev): mention short virtualenv path early 
This was the second time I ran into this issue. Annoying after going
through all the steps of installing applications in the virtual
environment etc.
 2015-01-07 22:25:31 +01:00
Jens Rantil
4666b29174 doc(bootstrap-dev): make long socket path warning a note 
It doesn't really feel like part of the text body.
 2015-01-07 22:25:24 +01:00
Pedro Algarvio
1ce6910467 Some fixes to #19161 2015-01-07 20:58:40 +00:00
Jens Rantil
fee650b4b0 one less command to get started when bootstrapping 2015-01-07 21:41:19 +01:00
Pedro Algarvio
a952d46830 Merge branch 'develop' of https://github.com/h4ck3rm1k3/salt into merge/19161 2015-01-07 18:09:15 +00:00
Colton Myers
c5cdc575d0 Merge branch '2015.2' into merge-forward-develop 
Conflicts:
	salt/utils/reactor.py
	tests/jenkins-ng.py
 2015-01-06 14:16:15 -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
James Michael DuPont
e6e7ab6cbc rooted config 
* updated documentation
* troubleshooting
* Itegrated comments and feedback
* bugfixes to format and language
* linting the changes
 2015-01-01 07:07:09 -06:00
manonthemat
a1625ef7c6 added note about Arch Linux's default transport 2014-12-30 11:28:15 -08:00
twellspring
43aa4293b1 Install remaining core components: salt-cloud, ... 
Core components salt-cloud, salt-ssh, salt-api are packaged separately, but should be installed by most users.
 2014-12-29 10:13:13 -08:00
Justin Findlay
ad33589fac move requirements files into requirements dir 2014-12-27 17:29:03 -07:00
Matthias Sieber
d8af90c611 update States Tutorial part 2 
Explanation of yaml file with matching line numbers
 2014-12-23 16:20:42 -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
d2e9378084 Switch html_title to empty string instead of None 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
Seth House
f345188d06 Set minimum Sphinx version to 1.3 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
Seth House
c0567bab0f Updated Formula Best Practices doc with several recommendations 2014-12-12 17:43:00 -07:00
Seth House
d0f038eec0 Minor clarification to not pointing directly to formulas repos 2014-12-12 17:42:54 -07:00
Seth House
e7922758ae Minor rST formatting 2014-12-12 17:42:53 -07:00
Thomas Jackson
4d41fa35a1 Comma cleanup 2014-12-12 11:40:36 -08:00
Thomas Jackson
2bd05998b3 Comma cleanup 2014-12-12 11:40:10 -08:00
Thomas Jackson
2fa6dad350 Comma cleanup 2014-12-12 11:39:55 -08:00
Thomas Jackson
fb7e5630d8 Comma cleanup 2014-12-12 11:39:40 -08:00
Thomas Jackson
f0aae727ce Comma cleanup 2014-12-12 11:39:07 -08:00
Thomas Jackson
d5d0a35297 Comma cleanup 2014-12-12 11:38:50 -08:00
Thomas Jackson
57933e9148 Comma cleanup 2014-12-12 11:38:18 -08:00
Thomas Jackson
85864eca4a Comma cleanup 2014-12-12 11:37:59 -08:00
Thomas Jackson
7da2bbc457 fix usage of e.g (no comma) 2014-12-12 11:37:48 -08:00
Thomas Jackson
8df54973c3 Comma cleanup 2014-12-12 11:34:51 -08:00
Thomas Jackson
da3ea213e9 Comma cleanup 2014-12-12 11:34:34 -08:00
Thomas Jackson
23674c100d Comma cleanup 2014-12-12 11:33:14 -08:00
Thomas Jackson
c1860f3dd9 Comma cleanup 2014-12-12 11:32:58 -08:00
Thomas Jackson
8b635fe07d Comma Cleanup 2014-12-12 11:32:16 -08:00
Thomas Jackson
3f4b2cc8bb Comma cleanup 2014-12-12 11:31:43 -08:00
Thomas S Hatch
e094b0136f Merge pull request #18902 from jacksontj/develop 
More grammar/style cleanup
 2014-12-12 09:40:55 -07:00
Joseph Hall
7099c02a53 Add serial commas to the style guide 2014-12-12 03:30:11 -07:00
Steve Groesz
e66a02b18b Update netapi reference 
Resolves issue #18760
 2014-12-11 18:14:47 -06:00
Thomas S Hatch
16b4c9eb74 Merge pull request #18904 from MrCitron/feature-18866 
Feature 18866
 2014-12-11 17:04:39 -07:00
Steve Groesz
6cb313533b Fix missing text 
Found missing colon, causing code blocks not to display.  This fixes issue #18879
 2014-12-11 17:29:31 -06:00
Metin OSMAN
d0799a864c Update documentation 2014-12-11 22:25:29 +01:00
Metin OSMAN
0e8d617523 Merge branch 'develop' of https://github.com/saltstack/salt into feature-18866 2014-12-11 21:35:05 +01:00
Thomas Jackson
f268bb8b4b Whitespace cleanup 2014-12-11 07:53:20 -08:00