valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
75,659 Commits 24 Branches 182 Tags 341 MiB
4913c4f90c
Commit Graph

3969 Commits

Author SHA1 Message Date
Nicole Thomas
a275b9714e Merge pull request #38815 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2017-01-20 11:53:00 -07:00
rallytime
315b2c8712 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/modules/win_system.py
  - tests/unit/modules/win_system_test.py
 2017-01-18 14:16:45 -07:00
David Boucha
dbe9edb806 fix reactor example. 
This version is tested on 2016.11 branch and was found working
ZD 1035
 2017-01-18 11:46:34 -07:00
rallytime
1e125e2844 Update pillar tutorial lanuage regarding pillar_opts settings 
The pillar_opts option defaults to ``False``. This change updates
the language in the pillar tutoral to be in-line with the default
setting.

Fixes #38629
 2017-01-17 14:55:17 -07:00
rallytime
64d866f7ab Merge branch '2016.3' into '2016.11' 
No conflicts.
 2017-01-17 11:44:26 -07:00
Denys Havrysh
4620dc4afa DOCS: add C++ compiler installation on RHEL required for bundled 0mq 2017-01-17 15:02:31 +02:00
rallytime
30e8a66fb0 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/netapi/rest_tornado/saltnado.py
  - tests/integration/netapi/rest_tornado/test_app.py
 2017-01-16 18:54:14 -07:00
rallytime
d24776f5e9 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - conf/master
  - doc/topics/netapi/index.rst
  - salt/netapi/__init__.py
 2017-01-15 16:07:55 -07:00
Denys Havrysh
b872bb63f6 DOCS: correct examples of running test suite 2017-01-15 11:48:04 +02:00
Sébastien Santoro
6d3717b9ee Proofread jinja_to_execution_module tutorial (#38720) 2017-01-13 14:53:50 -07:00
rallytime
4e1e45d640 Merge branch '2016.3' into '2016.11' 
No conflicts.
 2017-01-13 14:45:36 -07:00
rallytime
b910499dbe Various follow up fixes 
Merge branch '2015.8.12_follow_up' into '2015.8'
 2017-01-13 14:40:17 -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
e8309a6bbf Add release notes for 2015.8.13 2017-01-09 14:25:31 -07:00
rallytime
34282322c0 Clean up tests and docs for batch execution 
Batch execution was removed from NetapiClient and Saltnado in
previous commits. This change is a follow up that removes related
test cases and doc references.
 2017-01-09 11:29:34 -07:00
Super-User
fbdd32f46b add note related to issue #37027 2017-01-06 15:25:51 +01: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
Mike Place
7b74436d13 Merge pull request #38562 from rallytime/arch-install-docs 
Update arch installation docs with correct package name
 2017-01-04 13:04:27 -07: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
David Boucha
4ddbc2ecaa add note about pyVmomi locale workaround (#38536) 2017-01-04 09:24:04 -05:00
twangboy
e96bfe8fa2 Change OSX/OS X to macOS where possible 2016-12-28 14:49:46 -07:00
rallytime
efb8a8ddf5 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - doc/ref/configuration/minion.rst
  - salt/config/__init__.py
  - salt/minion.py
 2016-12-22 10:39:14 -07:00
Erik Johnson
27253522c8 Improve pillar documentation (#38407) 
* rename anchor

* Move pillar cache config option to different section, add an anchor

* Add links to master and minion config items

* Add documentation for pillar.item's "delimiter" argument

* Improve pillar documentation

This improves RST formatting, adding hyperlinks as well as adding
information on the difference between in-minion pillar data and
pillar data that is compiled on-demand.

* Add section on how pillar environments are handled
 2016-12-22 10:32:37 -07:00
rallytime
c6e191ad0d Remove doc markup references from 2016.11 branch 2016-12-19 15:14:37 -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
Mike Place
c83db5a785 Merge pull request #38320 from rallytime/cleanup-doc-refs 
Cleanup doc internal markup references
 2016-12-18 05:31:27 -07:00
Mike Place
ebb9f6cbbc Merge pull request #38323 from rallytime/update-cloud-provider-links 
Update the Cloud Provider Specifics links in cloud docs
 2016-12-18 05:30:48 -07:00
rallytime
5940db5b3f Merge branch '2016.3' into '2016.11' 
No conflict.
 2016-12-16 15:25:08 -07:00
rallytime
022caf23e9 Update the Cloud Provider Specifics links in cloud docs 
- Reordered some to be alphabetical
- Added Azure Arm
- Added Dimension Data
 2016-12-16 15:19:45 -07:00
rallytime
5c42a361a0 Remove ":doc:" references from all doc/topics/installation/* files 2016-12-15 16:50:16 -07:00
rallytime
23bce1c929 Remove ":doc:" references from all doc/topics/releases/* files 2016-12-15 16:45:51 -07:00
rallytime
4aafa41d22 Remove ":doc:" references from a bunch of doc/* files 2016-12-15 16:09:27 -07:00
rallytime
02bfe7912c Remove more ":doc:" references from doc/* files 2016-12-15 15:36:44 -07:00
rallytime
6e32267d0c Remove ":doc:" references in salt/* files 2016-12-15 14:03:56 -07:00
rallytime
4a62d01577 Add docs for syndic_wait setting 
Fixes #38174
 2016-12-15 10:40:01 -07:00
Nicole Thomas
56a8fa3f77 Add 2016.11.2 release notes (#38260) 2016-12-14 16:40:06 -07:00
rallytime
6a327d1367 Merge branch '2016.3' into '2016.11' 
No conflicts.
 2016-12-13 10:19:47 -07:00
Denys Havrysh
a6098bac1a Remove note about SaltTesting installation, now it is in the requirements 2016-12-13 11:38:35 +02:00
rallytime
e31f97cf71 Merge branch '2016.3' into '2016.11' 
No conflicts.
 2016-12-12 10:08:27 -07:00
Denys Havrysh
e9f419ff64 Document the requirements for running ZeroMQ-based integration tests 2016-12-10 22:16:18 +02:00
Megan Wilhite
f7294dc85b add 2016.11.1 changelog to release notes (#38186) 2016-12-09 15:44:09 -07:00
Joseph Hall
71b787e250 Add Azure ARM docs for 2016.11.0 2016-12-08 12:43:18 -07:00
Megan Wilhite
1a42e24e72 Fix beacon index (#38129) 
* add new beacon modules to index

* add salt.beacons.avahi_announce to index and release notes
 2016-12-07 10:44:53 -07:00
Nicole Thomas
5d9d6b9280 Merge pull request #38057 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2016-12-06 16:11:41 -07:00
Nicole Thomas
1bb31bbebd Start release notes file for 2016.11.1 release (#38084) 2016-12-05 15:24:11 -07:00
rallytime
8fd53a4808 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - doc/topics/cloud/vsphere.rst
  - salt/config/__init__.py
  - salt/daemons/masterapi.py
  - salt/templates/rh_ip/network.jinja
  - salt/utils/parsers.py
  - tests/unit/daemons_test.py
 2016-12-02 12:18:18 -07:00
Ch3LL
e95f88fbe3 add docs for hash_type change to sha256 2016-12-02 09:28:50 -07:00
Dmitry Kuzmenko
e51448f5ed Added Carbon release notes. Fixed sphinx errors in the file. (#38022) 2016-12-01 09:59:15 -07:00
Nicole Thomas
6f34332e87 Adjust code examples to use the actual bootstrap-salt.sh file name (#38011) 2016-12-01 09:01:25 -07:00
Nicole Thomas
186b3c7959 Fix RST link format (#37958) (#37970) 2016-11-29 14:34:07 -07:00