nee2c/salt: saltstack @ resolve-conflict-#54907

saltstack

Charles McMarrow d48ba0e955 Merge branch 'master' into master		5 vuotta sitten
.ci	98dbaf525d Update pipeline to use the newer salt pipeline library	5 vuotta sitten
.github	be989aea9d Merge pull request #54562 from garethgreenaway/2019_2_1_port_52633	5 vuotta sitten
conf	7db6705cca doc_ipc_mode_Windows_against_master	5 vuotta sitten
doc	53dd3d9b41 Merge pull request #55129 from bryceml/master_remove_google_analytics	5 vuotta sitten
pkg	0d13fbc2ed Address static requirements security vulnerabilities	5 vuotta sitten
requirements	c086a7546a Add crypto requirements constrains.	5 vuotta sitten
rfcs	9d11cc189a [RFC] add rfc for loader changes in Fluorine	6 vuotta sitten
salt	d48ba0e955 Merge branch 'master' into master	5 vuotta sitten
scripts	11a94cad12 Remove an empty line	6 vuotta sitten
templates	3273bbdab7 Merge branch '2017.7' into '2018.3'	6 vuotta sitten
tests	11efae0370 Merge pull request #55101 from s0undt3ch/hotfix/coverage-reporting	5 vuotta sitten
.codeclimate.yml	c58af57bc0 Tweak codeclimate settings for less noise	5 vuotta sitten
.codecov.yml	7f77809043 Update `.codecov.yml` with new settings	5 vuotta sitten
.coveragerc	d78e2a32e2 Update `.coveragerc`	5 vuotta sitten
.editorconfig	364006bcfb Added .editorconfig for easier editing.	9 vuotta sitten
.gitignore	6db414194e Also ignore multiprocessing coverage files	5 vuotta sitten
.kitchen.yml	f3a6e2efc3 update branches for codecove and kitchen	5 vuotta sitten
.mention-bot	453c3d7f20 Always notify tkwilliams when changes occur on boto files	7 vuotta sitten
.pre-commit-config.yaml	c086a7546a Add crypto requirements constrains.	5 vuotta sitten
.pylintrc	8a341cdbb9 add docker proxy minion	6 vuotta sitten
.testing.pylintrc	0372718831 Fix lint issues on salt	5 vuotta sitten
AUTHORS	51fb191157 Merge pull request #39841 from rafaelcaricio/telegram-beacon	7 vuotta sitten
CHANGELOG.md	c746267786 Add changelog file, to start adhering to SEP 1 (#54890)	5 vuotta sitten
CODE_OF_CONDUCT.md	a2df0c22c0 Rename conduct file to code_of_conduct to be more clear	7 vuotta sitten
CONTRIBUTING.rst	b4f148e4df Break out support and contributing docs into separate files	6 vuotta sitten
COPYING	dd562dd200 Update Salt's licensing information to include cptestcase	8 vuotta sitten
Gemfile	eb87816559 change to saltstack version of kitchen-salt	5 vuotta sitten
HACKING.rst	4a218142a5 Remove support for RAET	5 vuotta sitten
LICENSE	1dd0e342b5 Update license date and include NOTICE	6 vuotta sitten
MANIFEST.in	ad33589fac move requirements files into requirements dir	10 vuotta sitten
NOTICE	1dd0e342b5 Update license date and include NOTICE	6 vuotta sitten
Pipfile	6dd8e40266 Update pytest requirements	5 vuotta sitten
README.rst	2292f1bfd0 remove Google+ from README.rst	5 vuotta sitten
SUPPORT.rst	b4f148e4df Break out support and contributing docs into separate files	6 vuotta sitten
noxfile.py	eea27dc56b Timestamp log files	5 vuotta sitten
setup.py	4a218142a5 Remove support for RAET	5 vuotta sitten
tox.ini	01b74c06c4 Add initial nox configuration. Tell `tox`'ers to use `nox`'.	5 vuotta sitten

		
			
			
				README.rst
			
		
		
	
			
				==================
What is SaltStack?
==================

SaltStack makes software for complex systems management at scale.
SaltStack is the company that created and maintains the Salt Open
project and develops and sells SaltStack Enterprise software, services
and support. Easy enough to get running in minutes, scalable enough to
manage tens of thousands of servers, and fast enough to communicate with
them in *seconds*.

Salt is a new approach to infrastructure management built on a dynamic
communication bus. Salt can be used for data-driven orchestration,
remote execution for any infrastructure, configuration management for
any app stack, and much more.

Download Salt Open
==================

Salt Open is tested and packaged to run on CentOS, Debian, RHEL, Ubuntu,
Windows. Download Salt Open and get started now.

``_

`Installation Instructions `_

SaltStack Documentation
=======================

Installation instructions, getting started guides, and in-depth API
documentation.

``_

``_

Engage SaltStack
================

`SaltConf`_, **User Groups and Meetups** - SaltStack has a vibrant and `global
community`_ of customers, users, developers and enthusiasts. Connect with other
Salted folks in your area of the world, or join `SaltConf`_, the SaltStack
annual user conference held in Salt Lake City. Please visit the `SaltConf`_ site
for details of our next conference. Also, please let us know if you would like
to start a user group or if we should add your existing SaltStack user group to
this list by emailing: info@saltstack.com

**SaltStack Training** - Get access to proprietary `SaltStack education
offerings`_ through instructor-led training offered on-site, virtually or at
SaltStack headquarters in Salt Lake City. SaltStack Enterprise training helps
increase the value and effectiveness of SaltStack software for any customer and
is a prerequisite for coveted `SaltStack Certified Engineer (SSCE)`_ status.
SaltStack training is also available through several `SaltStack professional
services`_ offerings.

**Follow SaltStack on -**

* YouTube - ``_
* Twitter - ``_
* Facebook - ``_
* LinkedIn - ``_
* LinkedIn Group - ``_

.. _global community: http://www.meetup.com/pro/saltstack/
.. _SaltConf: http://saltconf.com/
.. _SaltStack education offerings: http://saltstack.com/training/
.. _SaltStack Certified Engineer (SSCE): http://saltstack.com/certification/
.. _SaltStack professional services: http://saltstack.com/services/

			
		