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
Colton Myers
c2eed77691
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5
2015-05-18 17:07:15 -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
Colton Myers
7729834d92
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5
...
Conflicts:
salt/client/ssh/wrapper/__init__.py
2015-05-06 15:45:11 -06:00
Justin Findlay
8074d16d52
2015.2 -> 2015.5
...
Related to https://github.com/saltstack/salt-windows-dev/pull/10 .
2015-05-06 11:40:01 -06:00
Colton Myers
a8f797e0e4
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
2015-04-28 09:48:53 -06:00
rallytime
f6cc7c8f8a
Adjust ZeroMQ 4 docs to reflect changes to Ubuntu 12 packages
...
Removed the chrislea ppa third party installation information. This
shouldn't be needed anymore for any Ubuntu package after 2014.7.5.
2015-04-27 15:57:41 -06:00
Colton Myers
1f9934c634
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
...
Conflicts:
doc/topics/installation/windows.rst
doc/topics/tutorials/gitfs.rst
2015-04-20 11:39:41 -06:00
Justin Findlay
e99f2fdb28
Merge pull request #22813 from twangboy/win_doc_fix
...
Updated instructions for building salt
2015-04-17 22:10:07 -06:00
twangboy
adc421acdd
Fixed some formatting issues
2015-04-17 15:03:47 -06:00
twangboy
8901b3b5a6
Updated instructions for building salt
2015-04-17 14:41:46 -06:00
rallytime
5931a582d1
Replace all 4s with 5s
2015-04-17 14:15:33 -06:00
rallytime
eadaead755
Add 2014.7.5 links to windows installation docs
2015-04-17 14:13:40 -06:00
Colton Myers
25f9b2d2d1
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
...
Conflicts:
doc/topics/cloud/action.rst
doc/topics/cloud/function.rst
doc/topics/reactor/index.rst
2015-04-07 10:05:35 -06:00
rallytime
1abaacd868
Add windows package installers to docs
2015-03-30 16:10:10 -06:00
Colton Myers
c3b7be0655
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
...
Conflicts:
doc/topics/installation/rhel.rst
salt/output/__init__.py
salt/utils/__init__.py
2015-02-20 13:51:59 -07:00
Erik Johnson
396e234848
Update the RHEL installation guide
...
This updates the RHEL install instructions to reflect the new COPR for
installation on RHEL/CentOS 5.
Additionally, it provides better instructions on how to enable EPEL:
- We don't care about EPEL5, so this link has been removed.
- We needed a link for EPEL7, so this has been added.
- The old RPM installation example used hard-coded URLs to an arbitrary
EPEL mirror. This is not a good idea since A) the mirror could go
away, and B) we are unfairly sending people to a single mirror when
the Fedora Project has a perfectly good link on their wiki to send
people to a "random" mirror. The install example now uses these links.
2015-02-20 11:59:19 -06:00
rallytime
9322d3b307
Update Arch installation docs to reference salt-zmq and salt-raet pkgs
2015-02-18 16:22:46 -07:00
rallytime
928bb30a6b
Add 2014.7.2 package links to the windows installer docs
2015-02-18 13:55:26 -07:00
rallytime
dc23823897
Merge branch '2014.7' into '2015.2'
...
Conflicts:
salt/modules/localemod.py
2015-01-27 13:24:14 -07:00
Shane D Lee
7c253f5ede
Changed exe's to installers
2015-01-26 15:48:03 -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
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
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
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
Thomas Jackson
2bd05998b3
Comma cleanup
2014-12-12 11:40:10 -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 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
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
Rick Holzer
e8df3f5332
Clarification
2014-12-02 16:21:55 -07:00
rallytime
9fe67a34c2
Make ZMQ 4 installation docs for ubuntu more clear
...
References #18476
2014-12-01 11:48:17 -07:00
Thomas S Hatch
cfd9352e8b
Merge pull request #18076 from UtahDave/develop
...
add additional repository command
2014-11-14 14:24:56 -07:00
Erik Johnson
6902e829dd
Add warning on RHEL ZMQ4 docs regarding python-hashlib
2014-11-14 11:51:42 -06:00
David Boucha
0e25bc4955
add additional repository command
...
Is Canonical trying to make it harder and harder to find this?
2014-11-13 17:13:50 -07:00
Colton Myers
257b3d4426
Merge branch '2014.7' into merge-forward
...
Conflicts:
salt/utils/__init__.py
salt/utils/minions.py
2014-11-10 14:08:49 -07:00
rallytime
4cbeebd3d0
Add 2014.7.0 release to windows installation doc
2014-11-07 15:26:28 -07:00
Thomas S Hatch
01b917fcf6
Merge branch '2014.7' into develop
...
Conflicts:
doc/topics/installation/windows.rst
salt/states/rabbitmq_cluster.py
2014-11-06 15:04:40 -07:00
Ignacio Torres Masdeu
5977ac4abf
Explicitly explain homebrew's stance on sudo
2014-11-06 16:37:38 +01:00
Ignacio Torres Masdeu
6c8ad36c96
Homebrew explicitly discourages the use of sudo
...
https://github.com/Homebrew/homebrew/blob/master/share/doc/homebrew/FAQ.md#sudo
2014-11-06 16:10:32 +01:00
rallytime
6f10b96f01
Update windows installer links to include 2014.1.13 pkgs
2014-11-05 16:15:07 -07:00
nerdling
4d02c8da81
Update doc/topics/installation/osx.rst
...
Unify instructions across package managers.
2014-10-26 16:20:13 -04:00
rallytime
933be7c476
Merge branch '2014.7' into develop
...
Conflicts:
salt/master.py
salt/returners/mysql.py
salt/utils/cloud.py
salt/utils/minions.py
2014-10-25 08:54:42 -06:00
Erik Johnson
706f53941b
Add notice on automatic installation of repoquery
2014-10-24 16:15:48 -05:00
Thomas S Hatch
9992edfdca
Merge branch '2014.7' into develop
...
Conflicts:
salt/loader.py
2014-10-20 15:52:31 -06:00
rallytime
559ed2906b
Fix small typo in fedora installation docs
2014-10-20 12:06:46 -06:00