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
Thomas Jackson
68c0dc0717
Whitespace cleanup
2014-12-11 07:53:20 -08:00
Thomas Jackson
9523435ee4
Whitespace cleanup
2014-12-11 07:53:20 -08:00
Thomas Jackson
4df8db515c
Whitespace cleanup
2014-12-11 07:53:20 -08:00
Thomas Jackson
e32a7e1ed7
Whitespace cleanup
2014-12-11 07:53:20 -08:00
Thomas Jackson
9db7f8f7e9
Whitespace cleanup
2014-12-11 07:53:19 -08:00
Thomas Jackson
2afd4c8c04
Whitespace cleanup
2014-12-11 07:53:19 -08:00
Thomas Jackson
d12677156e
Whitespace cleanup
2014-12-11 07:53:19 -08:00
Thomas Jackson
498a612078
Whitespace cleanup
...
Conflicts:
doc/topics/cloud/linode.rst
doc/topics/cloud/misc.rst
doc/topics/cloud/parallels.rst
doc/topics/cloud/proxmox.rst
Conflicts:
doc/topics/development/architecture.rst
doc/topics/development/translating.rst
2014-12-11 07:53:19 -08:00
Thomas Jackson
0f4a23b93a
Trailing whitespace cleanup
2014-12-11 07:53:19 -08:00
Thomas Jackson
c18e834be1
Fix trailing whitespace
...
Conflicts:
doc/topics/tutorials/states_pt2.rst
2014-12-11 07:53:19 -08:00
Thomas Jackson
52fe04db18
Remove trailing whitespace
2014-12-11 07:53:19 -08:00
Thomas Jackson
3859204103
Fix typo in renderers doc, the directory name was wrong
2014-12-10 18:42:16 -08:00
Metin OSMAN
21a6f6f0e7
Add the ability to filter the map file with salt-cloud
2014-12-11 01:39:54 +01:00
Thomas S Hatch
bcb529f809
Merge pull request #18823 from scalp42/typos
...
Correct some typos
2014-12-09 14:43:15 -07:00
Pedro Algarvio
e5dc9f5b28
Merge pull request #18849 from techhat/ec2win
...
Copy fixes for Windows Salt Cloud doc
2014-12-09 19:03:20 +00:00
Joseph Hall
25d8cb6560
Copy fixes for Windows Salt Cloud doc
2014-12-09 11:57:35 -07:00
Thomas S Hatch
3d73816507
Merge branch '2014.7' into develop
...
Conflicts:
salt/modules/virtualenv_mod.py
salt/states/network.py
salt/utils/parsers.py
2014-12-09 10:59:18 -07:00
Anthony Scalisi
44963fae0e
fix various typos
2014-12-08 14:32:53 -08:00
Thomas S Hatch
ac08c08695
Merge pull request #18815 from techhat/ec2win
...
Allow userdata to be passed to EC2
2014-12-08 15:07:38 -07:00
Joseph Hall
790cd28ff1
Update Windows docs for auto-generated Windows passwords
2014-12-08 14:23:05 -07:00
Thomas S Hatch
7dd99fbd91
Merge pull request #18794 from nmadhok/doc-fixes
...
Doc fixes
2014-12-08 13:22:39 -07:00
Thomas S Hatch
0c6655544c
Merge pull request #18782 from rallytime/master_tops_rendering
...
Fix markup so master_tops document will render correctly
2014-12-08 13:21:00 -07:00
Thomas S Hatch
a47aa7be76
Merge pull request #18765 from pass-by-value/api_tokens
...
Accept salt token for cherrypy /events
2014-12-08 13:11:43 -07:00
Nitin Madhok
d2685b8fa2
Fixing sphinx errors
2014-12-08 11:18:12 -05:00
Nitin Madhok
c299f4119a
Adding pillar to toctree
2014-12-08 10:52:38 -05:00
Nitin Madhok
f168af05ef
Adding state to toctree
2014-12-08 10:50:09 -05:00
Nitin Madhok
67fd828708
Adding modules to toctree
2014-12-08 10:34:33 -05:00
Erik Johnson
00bf5daff8
Add bugfix for #17963 to 2014.7.1 releae notes
2014-12-08 08:45:03 -06:00
JP Viljoen
6f3a1ab7b3
[docs] fix minor typo
2014-12-07 10:24:49 +02:00
rallytime
9e5350c2f4
Fix markup so master_tops document will render correctly
...
Fixes #18723
2014-12-05 20:47:41 -07:00
Aditya Kulkarni
e19550763b
Accept salt token for cherrypy /events
2014-12-05 12:15:23 -05:00
Thomas S Hatch
683987e4c3
Merge pull request #18715 from styro/new-windows-deps
...
Add some new Windows build dependencies to docs.
2014-12-04 16:46:02 -07:00
Colton Myers
79e5e80ad1
Add state.single to salt-ssh release notes for lithium
2014-12-04 14:35:52 -07:00
Colton Myers
472f6577e2
Merge branch '2014.7' into merge-forward
...
Conflicts:
salt/minion.py
salt/modules/localemod.py
salt/states/mount.py
salt/transport/__init__.py
salt/utils/schedule.py
2014-12-04 11:11:11 -07:00
Anton D
12a43353e3
Add some new Windows build dependencies to docs.
2014-12-04 23:34:21 +13:00
Thomas S Hatch
8a7134e72d
Merge pull request #18672 from whiteinge/mod_aggregate-state-level
...
Add docs for mod_aggregate state-level keywords
2014-12-03 21:12:10 -07:00
Thomas S Hatch
e6f843dde1
Merge pull request #18650 from bbeausej/develop
...
salt-cloud GCE : Support for addresses & internal IPs
2014-12-03 20:56:07 -07:00
Thomas S Hatch
1bfed11756
Merge pull request #18541 from cachedout/event_return
...
Event return
2014-12-03 09:56:33 -07:00
Seth House
54d8760d2d
Added docs for the state-level aggregate keyword
...
Also added clarification on the two ways to invoke the aggregation
function.
2014-12-02 18:33:10 -05:00
Rick Holzer
e8df3f5332
Clarification
2014-12-02 16:21:55 -07:00
Benoit Beausejour
680689e78a
Updated documentation for GCE:
...
- Support for fixed address
- New salt function for create_address, delete_address, show_address
2014-12-02 15:38:00 -05:00
Thomas S Hatch
abc6859e09
Merge pull request #18622 from Supermathie/develop
...
alternative way of restarting windows minion
2014-12-02 10:05:16 -07:00
Thomas S Hatch
dbcc98e5ba
Merge pull request #18610 from rallytime/update_zmq4_docs
...
Make ZMQ 4 installation docs for ubuntu more clear
2014-12-02 10:04:16 -07:00
Daniel Nägele
81164c17e7
document the dependencies for the schedule options 'when' and 'range'
2014-12-02 13:33:50 +01:00
Colton Myers
fcc2196a5f
Merge branch '2014.7' into merge-forward
...
Conflicts:
salt/cloud/__init__.py
salt/modules/boto_secgroup.py
salt/modules/boto_vpc.py
salt/modules/file.py
salt/modules/zcbuildout.py
salt/runner.py
salt/runners/lxc.py
salt/runners/manage.py
salt/utils/schedule.py
tests/unit/modules/boto_vpc_test.py
tests/unit/modules/hashutil_test.py
tests/unit/templates/jinja_test.py
2014-12-01 15:04:03 -07:00
Michael Brown
9b39eae40c
alternative way of restarting windows minion
2014-12-01 16:51:58 -05:00
Tim O'Guin
39fb372898
fixed allocate_new_eip typo in AWS cloud docs
2014-12-01 14:46:32 -06:00
rallytime
9fe67a34c2
Make ZMQ 4 installation docs for ubuntu more clear
...
References #18476
2014-12-01 11:48:17 -07:00
Elias Probst
6a7662c498
Fix typo (agregate → aggregate).
2014-11-29 15:58:07 +01:00
Erik Johnson
b11542dab9
Update 2014.7.1 release notes
2014-11-28 16:55:49 -06:00
T.J. Yang
3f1a007318
shifting chapters in contents 1-3 rst files
2014-11-27 04:15:38 -06:00
T.J. Yang
f024e34e3a
without this patch,salt-[1-3].pdf content are wrong
2014-11-27 03:50:17 -06:00
Mike Place
8297c2c48e
Documentation
2014-11-26 16:56:45 -07:00
Seth House
75ef72b7fb
Merge pull request #18523 from saltstack/revert-18148-six_docs_build
...
Revert "[don't merge!!] Add six dependency notice to building docs intru...
2014-11-26 16:19:42 -07:00
T.J. Yang
a6535cf37d
makefile update at Wed Nov 26 16:21:18 CST 2014
2014-11-26 16:21:18 -06:00
Pedro Algarvio
f5794f837c
Update 'doc/.tx/config' - Build #213
...
http://cookingwithsalt.org/job/salt/job/transifex/213/
Signed-off-by: Pedro Algarvio <pedro@algarvio.me>
2014-11-26 20:01:25 +00:00
Nicole Thomas
e1157d13be
Revert "[don't merge!!] Add six dependency notice to building docs intructions"
2014-11-26 12:23:13 -07:00
Thomas S Hatch
2e3089410a
Merge pull request #18514 from cachedout/issue_16879
...
Update docs for unless
2014-11-26 09:29:24 -07:00
Thomas S Hatch
6aa5b0f858
Merge branch '2014.7' into develop
...
Conflicts:
salt/modules/genesis.py
salt/modules/parted.py
salt/modules/win_service.py
salt/runner.py
salt/states/file.py
tests/integration/netapi/rest_tornado/test_app.py
2014-11-26 09:24:24 -07:00
Mike Place
988b8e621d
Update docs for unless
...
Note that unless is run for each associate state dec.
2014-11-26 09:17:14 -07:00
Colton Myers
397d61b1fc
Add lithium release notes
2014-11-25 15:25:46 -07:00
rallytime
73f3c0091d
Clean up doc build so it doesn't stacktrace
...
Fixes #18471
- Add zmq.eventloop to mocked modules in doc/conf.py
- Cleaned up rst references in rest_tornado.rst
2014-11-25 15:11:15 -07:00
Nitin Madhok
93700aa642
Fixing sphinx errors and violations
2014-11-25 15:01:30 -05:00
Thomas S Hatch
389aae80b9
Merge pull request #18448 from fabaff/doc-firewall
...
add section about fedora 18+ and rhel/centos 7
2014-11-25 09:34:04 -07:00
Konrad Starzyk
0759323c99
Merge remote-tracking branch 'upstream/develop' into jboss7
2014-11-25 11:52:27 +01:00
Fabian Affolter
d5caef6666
add section about fedora 18+ and rhel/centos 7
2014-11-24 23:56:28 +01:00
Colton Myers
754baafcf7
Merge branch '2014.7' into develop
2014-11-24 14:38:46 -07:00
Colton Myers
42223567b8
Add warning to docs about topfile compilation
...
Ref #12483
2014-11-24 14:33:37 -07:00
Thomas S Hatch
330771940f
Merge pull request #18394 from s0undt3ch/hotfix/merge-forward
...
Merge branch '2014.7' forward into develop
2014-11-24 11:23:07 -07:00
Erik Johnson
55b80853f6
Add new release notes file for 2014.7.1
2014-11-24 10:36:46 -06:00
Erik Johnson
22962d097e
Fix wording in 2014.1.1 release notes
...
As this was the first bugfix release for 2014.1.0, it should not be
described as "another" bugfix release.
2014-11-24 10:35:47 -06:00
Erik Johnson
c0d9b84a86
Add 2014.7.0 to toctree
2014-11-24 09:46:48 -06:00
Pedro Algarvio
0b946ba32b
Merge branch '2014.7' into hotfix/merge-forward
2014-11-22 02:17:10 +00:00
T.J. Yang
5f3cf20ffc
makefile update at Fri Nov 21 17:12:48 CST 2014
2014-11-21 17:12:48 -06:00
rallytime
91538d7ec1
Add information about salt-cloud events to master events doc
2014-11-21 15:57:59 -07:00
Konrad Starzyk
6656837ff0
Merge remote-tracking branch 'upstream/develop' into jboss7
2014-11-21 21:52:46 +01:00
Colton Myers
dc43840cee
Merge branch '2014.7' into merge-forward
...
Conflicts:
salt/modules/glusterfs.py
salt/modules/macports.py
salt/modules/makeconf.py
salt/modules/mdadm.py
salt/modules/smartos_vmadm.py
salt/modules/zypper.py
salt/utils/event.py
tests/integration/netapi/rest_tornado/test_app.py
tests/unit/netapi/rest_tornado/test_handlers.py
2014-11-21 12:05:32 -07:00
T.J. Yang
ab842e1163
makefile update at Thu Nov 20 16:45:44 CST 2014
2014-11-20 16:45:44 -06:00
T.J. Yang
7e1a399abd
makefile update at Thu Nov 20 16:20:34 CST 2014
2014-11-20 16:20:34 -06:00
T.J. Yang
7497336a68
makefile update at Thu Nov 20 15:36:43 CST 2014
2014-11-20 15:36:43 -06:00
T.J. Yang
10b8b45b52
makefile update at Thu Nov 20 15:24:02 CST 2014
2014-11-20 15:24:02 -06:00
