Commit Graph

406 Commits

Author SHA1 Message Date
Robert James Hernandez
9cc9c6110d Adding explicit call to python-systemd in jessie-backports 2017-01-24 14:25:45 -08:00
rallytime
4e1e45d640 Merge branch '2016.3' into '2016.11'
No conflicts.
2017-01-13 14:45:36 -07:00
rallytime
30429b2e44 Remove the installation instructions for out-of-date community ppa
These packages are not being updated and it is causing confusion.

Ubuntu packages should be installed with the instructions on
repo.saltstack.com.
2017-01-09 17:13:50 -07:00
rallytime
30f14d15df Merge branch '2016.3' into '2016.11'
Conflicts:
  - salt/config/__init__.py
  - salt/engines/slack.py
2017-01-04 16:54:58 -05:00
rallytime
8b1897ace9 Update arch installation docs with correct package name
When 2016.11.0 was released, the naming of the salt package was
changed. The salt-zmq version is now named just "salt" and the
salt-raet pacakge is no longer being updated.
2017-01-04 13:08:47 -05:00
twangboy
e96bfe8fa2 Change OSX/OS X to macOS where possible 2016-12-28 14:49:46 -07:00
rallytime
513058945c Merge branch '2016.3' into '2016.11'
Conflicts:
  - doc/ref/states/requisites.rst
  - doc/topics/cloud/profitbricks.rst
  - doc/topics/cloud/vsphere.rst
  - doc/topics/releases/0.9.8.rst
  - doc/topics/releases/releasecandidate.rst
  - salt/cloud/clouds/vsphere.py
  - salt/minion.py
  - salt/states/archive.py
  - tests/unit/states/archive_test.py
2016-12-19 14:58:39 -07:00
rallytime
5c42a361a0 Remove ":doc:" references from all doc/topics/installation/* files 2016-12-15 16:50:16 -07:00
rallytime
4aafa41d22 Remove ":doc:" references from a bunch of doc/* files 2016-12-15 16:09:27 -07:00
rallytime
6e32267d0c Remove ":doc:" references in salt/* files 2016-12-15 14:03:56 -07:00
rallytime
3b56f8bce1 Merge branch '2016.3' into 'carbon'
Conflicts:
  - doc/topics/event/master_events.rst
2016-11-07 08:13:57 -07:00
twangboy
9e0631a1ae Add docs denoting the requirement for at least PowerShell 3 2016-11-04 14:04:43 -07:00
Jacob Hammons
7f968ddb72 Remove master installation instructions on Windows 2016-10-20 16:24:06 -07:00
rallytime
b8e215d358 Merge branch '2016.3' into 'carbon'
No conflicts.
2016-10-18 09:23:58 -06:00
rallytime
78a144f19a Merge branch '2015.8' into '2016.3'
No conflicts.
2016-10-18 09:16:21 -06:00
rallytime
24e0f5e024 Update the Fedora installation docs
There are no packages available in EPEL starting with Salt version
2015.5.2 through 2016.3.2. Fedora packages are available in EPEL
starting with 2016.3.3. This PR adds a documentation note about this.
2016-10-17 12:36:59 -06:00
rallytime
77f8120395 Merge branch '2016.3' into 'carbon'
Conflicts:
  - doc/topics/installation/windows.rst
  - salt/engines/sqs_events.py
  - salt/grains/core.py
2016-09-21 10:43:38 -06:00
twangboy
ec67a9bb2f Add cachedout's recommendations 2016-09-21 07:39:20 -06:00
twangboy
26a40dadbe Update docs for Windows 2016-09-20 17:19:40 -06:00
rallytime
ae595537ff Merge branch '2016.3' into 'develop'
Conflicts:
  - salt/modules/pkgng.py
2016-08-31 16:39:54 -06:00
Jacob Hammons
9910b9c6f9 Fix incremental doc builds - OS X, postgres returner, tcp transport doc updates (#35865)
* Updates doc builds to generate build timestamp only when building for docs.saltstack.com. This re-enables incremental builds.
Adds notes to OS X page that Salt master on OS X is not officially supported
Adds note to postgres returners to cross-link modules with usage explanation (ZD #875)
Adds example showing how to enable tcp transport

* Generate copyright date
Footer updates
2016-08-31 09:51:36 -06:00
rallytime
cf038ee3fe Merge branch '2015.8' into '2016.3'
Conflicts:
  - salt/grains/core.py
  - salt/modules/file.py
  - salt/modules/hosts.py
  - salt/modules/inspectlib/collector.py
  - salt/modules/portage_config.py
  - salt/modules/x509.py
  - salt/scripts.py
  - tests/integration/shell/enabled.py
2016-08-11 11:33:54 -06:00
Nicole Thomas
d9c20c0456 Update freebsd.rst (#35394)
Updated FreeBSD installation instructions to remove ``priority`` definition. 
(This, I believe, should address an issue submitted in saltstack/salt-bootstrap/issues/908)
2016-08-11 11:00:36 -06:00
twangboy
098a6bc538 Fix typos in documentation 2016-08-09 17:27:45 +00:00
twangboy
0a5d804a40 Update documentation for new installer 2016-08-09 17:23:48 +00:00
rallytime
d679c09e65 Merge branch '2016.3' into 'develop'
Conflicts:
  - salt/config/__init__.py
  - salt/utils/parsers.py
  - tests/unit/config/config_test.py
2016-07-18 10:34:03 -06:00
rallytime
cca9446c37 Various spelling fixes
Fixes #34630
2016-07-16 13:17:09 -06:00
Christer Edwards
220a3ae53f Update freebsd.rst
Updated FreeBSD installation instructions to remove ``priority`` definition. 
(This, I believe, should address an issue submitted in saltstack/salt-bootstrap/issues/908)
2016-07-10 10:22:30 -06:00
rallytime
8479c45728 Merge branch '2016.3' into 'develop'
No conflicts.
2016-06-21 17:29:44 -06:00
rallytime
73f3e12ce6 Update package dep note to systemd-python for RHEL7 install
Fixes #34120
2016-06-20 08:53:42 -06:00
rallytime
9d049e28e5 Merge branch '2016.3' into 'develop'
Conflicts:
  - salt/modules/win_pkg.py
  - salt/states/disk.py
2016-06-15 17:13:26 -06:00
Nicole Thomas
f546a00dc9 Merge pull request #34025 from rallytime/merge-2016.3
[2016.3] Merge forward from 2015.8 to 2016.3
2016-06-15 15:41:00 -04:00
Jacob Hammons
a4b67fd1e9 Updated latest release to 2016.3.1
Clean up installation instructions
code-block type updates
Add link to jinja tutorial
2016-06-15 11:52:02 -06:00
Jacob Hammons
b20213fd79 Adds links to several current Salt-related projects
Removes the salt_projects.rst file which hasn't been updated in a long time, this is replaced by the updated topics/projects/index.rst file
Adds a note about Salt Pack to the installation doc
2016-06-13 17:11:36 -06:00
rallytime
f078d57b57 Merge branch '2016.3' into 'develop'
Conflicts:
  - salt/modules/rabbitmq.py
  - salt/modules/win_servermanager.py
  - salt/state.py
  - salt/states/boto_s3_bucket.py
  - salt/states/pip_state.py
  - salt/states/win_servermanager.py
  - tests/unit/modules/win_servermanager_test.py
  - tests/unit/states/dockerng_test.py
2016-06-09 13:06:10 -06:00
rallytime
c5b4ec0b0f Merge branch '2015.8' into '2016.3'
Conflicts:
  - salt/cli/salt.py
  - salt/modules/groupadd.py
  - salt/states/service.py
2016-06-08 11:20:18 -06:00
Denys Havrysh
8621f5be54 Debian installation docs: drop section about community-maintained repository 2016-06-02 17:50:47 +03:00
Drew Adams
bcd6a1cd77 fix osfamily from Suse to SUSE 2016-05-26 22:08:40 -07:00
rallytime
760f479424 Merge branch '2015.8' into '2016.3'
Conflicts:
  - salt/cli/daemons.py
  - salt/config/__init__.py
  - salt/scripts.py
  - salt/state.py
  - tests/unit/config/config_test.py
2016-04-05 15:09:27 -06:00
Benjamin Drung
b484d6f9c9 Fix typo directorys -> directories 2016-04-04 14:20:39 +02:00
rallytime
f6d9cdc633 Merge branch '2015.8' into '2016.3'
Conflicts:
  - doc/ref/states/compiler_ordering.rst
  - doc/topics/installation/suse.rst
  - doc/topics/jobs/schedule.rst
  - doc/topics/targeting/grains.rst
  - doc/topics/tutorials/preseed_key.rst
  - doc/topics/tutorials/states_pt5.rst
  - pkg/suse/use-forking-daemon.patch
  - salt/minion.py
  - salt/modules/pacman.py
  - salt/modules/state.py
  - salt/modules/yumpkg.py
2016-03-25 11:47:16 -06:00
Jacob Hammons
8ec5d989ad 2015.8.8 release docs 2016-03-23 14:00:30 -06:00
rallytime
031a75ca33 Merge branch '2015.8' into '2016.3'
Conflicts:
  - Contributing.rst
  - conf/master
  - doc/index.rst
  - doc/man/salt.7
  - pkg/suse/README.suse
  - salt/client/ssh/state.py
  - salt/minion.py
  - salt/modules/zypper.py
  - salt/utils/schedule.py
  - tests/unit/modules/zypper_test.py
2016-03-02 10:26:13 -07:00
Denys Havrysh
aebc48163d Remove trailing white spaces in documentation files 2016-03-01 17:36:23 +02:00
virtualguy
e48900ac55 Use python-tornado from jessie-backports for pure debian 2016-02-29 22:42:15 +13:00
virtualguy
6e338e2601 Remove debian repo from raspbian installation
Binary packages from stock debain repo (http://httpredir.debian.org/debian) are not armv6 compatible so should not be installed on raspberry pi version 1. Rasbian doesn't have jessie-backports so safer just to install python-tornado from stretch.
2016-02-29 19:20:51 +13:00
Denys Havrysh
50f3e072b1 Add instruction how to install salt-minion on Debian Jessie from Stretch 2016-02-26 15:10:37 +02:00
Denys Havrysh
abcd505178 Update Debian installation guide with information about Raspbian 2016-02-26 13:30:22 +02:00
rallytime
3b74d123af Merge branch '2015.8' into '2016.3'
Conflicts:
  - salt/modules/selinux.py
  - salt/modules/zypper.py
  - salt/pillar/__init__.py
  - salt/states/dockerng.py
  - tests/runtests.py
2016-02-25 12:36:22 -07:00
Denys Havrysh
172f34a6ca Correct headers in Debian/Ubuntu/SUSE install instructions 2016-02-25 11:51:40 +02:00