saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch '2015.8' into '2016.3'

Browse source 
No conflicts.
This commit is contained in:
rallytime 2016-10-18 09:16:21 -06:00
commit 78a144f19a
2 changed files with 19 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
.testing.pylintrc
View file

@ -14,9 +14,6 @@ init-hook="
aXIsICdTY3JpcHRzJyksICdhY3RpdmF0ZV90aGlzLnB5JykKCiAgICBleGVjZmlsZShhY3RpdmF0 \
ZV90aGlzLCBkaWN0KF9fZmlsZV9fPWFjdGl2YXRlX3RoaXMpKQo='.decode('base64')"
# Profiled execution.
profile=no
# Add files or directories to the blacklist. They should be base names, not
# paths.
ignore=CVS
@ -208,10 +205,6 @@ reports=no
# (RP0004).
evaluation=10.0 - ((float(5 * error + warning + refactor + convention) / statement) * 10)
# Add a comment according to your evaluation note. This is used by the global
# evaluation report (RP0004).
comment=no
# Template used to display messages. This is a python new-style format string
# used to format the message information. See doc for all details
#msg-template=
@ -307,10 +300,6 @@ ignored-modules=
# (useful for classes with attributes dynamically set).
ignored-classes=SQLObject
# When zope mode is activated, add a predefined set of Zope acquired attributes
# to generated-members.
zope=no
# List of members which are set dynamically and missed by pylint inference
# system, and so shouldn't trigger E0201 when accessed. Python regular
# expressions are accepted.
@ -337,9 +326,6 @@ ignore-imports=no
[BASIC]
# Required attributes for module, separated by a comma
required-attributes=
# List of builtins function names that should not be used, separated by a comma
bad-functions=map,filter,apply,input
@ -442,10 +428,6 @@ spelling-store-unknown-words=no
[CLASSES]
# List of interface methods to ignore, separated by a comma. This is used for
# instance to not check methods defines in Zope's Interface base class.
ignore-iface-methods=isImplementedBy,deferred,extends,names,namesAndDescriptions,queryDescriptionFor,getBases,getDescriptionFor,getDoc,getName,getTaggedValue,getTaggedValueTags,isEqualOrExtendedBy,setTaggedValue,isImplementedByInstancesOf,adaptWith,is_implemented_by
# List of method names used to declare (i.e. assign) instance attributes.
defining-attr-methods=__init__,__new__,setUp

28
doc/topics/installation/fedora.rst
View file

@ -1,11 +1,21 @@
==================================
======
Fedora
==================================
======
Beginning with version 0.9.4, Salt has been available in the primary Fedora
repositories and `EPEL`_. It is installable using yum. Fedora will have more
up to date versions of Salt than other members of the Red Hat family, which
makes it a great place to help improve Salt!
repositories and `EPEL`_. It is installable using ``yum`` or ``dnf``, depending
on your version of Fedora.
.. note::
Released versions of Salt starting with ``2015.5.2`` through ``2016.3.2``
do not have Fedora packages available though `EPEL`_. To install a version
of Salt within this release array, please use SaltStack's `Bootstrap Script`_
and use the git method of installing Salt using the version's associated
release tag.
Release ``2016.3.3`` and onward will have packaged versions available via
`EPEL`_.
**WARNING**: Fedora 19 comes with systemd 204. Systemd has known bugs fixed in
later revisions that prevent the salt-master from starting reliably or opening
@ -31,8 +41,6 @@ will be one master and multiple minions.
yum install salt-master
yum install salt-minion
.. _`EPEL`: http://fedoraproject.org/wiki/EPEL
Installing from ``updates-testing``
-----------------------------------
@ -63,8 +71,6 @@ will need to provide your own systemd service unit.
Installation from pip:
.. _`PyPI`: https://pypi.python.org/pypi/salt
.. code-block:: bash
pip install salt
@ -111,3 +117,7 @@ To start the Minion:
systemctl start salt-minion.service
Now go to the :doc:`Configuring Salt</ref/configuration/index>` page.
.. _`Bootstrap Script`: https://github.com/saltstack/salt-bootstrap
.. _`EPEL`: http://fedoraproject.org/wiki/EPEL
.. _`PyPI`: https://pypi.python.org/pypi/salt