valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
77,322 Commits 24 Branches 182 Tags 341 MiB
70186de532
Commit Graph

4102 Commits

Author SHA1 Message Date
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
Erik Johnson
7f269bc7f9 Add clarification on expr_form usage and future deprecation (#37964) 2016-11-29 13:45:11 -07:00
Nicole Thomas
8f986b28dc Remove release candidate doc ref from 2016.11.0 release notes (#37931) 2016-11-28 13:49:28 -07:00
Nicole Thomas
0f8b187d15 Merge pull request #37923 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2016-11-28 12:55:03 -07:00
Thomas S Hatch
14271156f6 Add a release notes reference to the docker-sls tutorial (#37927) 2016-11-28 12:54:17 -07:00
rallytime
dfedd1185a Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/grains/core.py
  - salt/modules/ddns.py
  - salt/templates/rh_ip/network.jinja
 2016-11-28 11:08:19 -07:00
rallytime
523a67c422 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - doc/conf.py
  - doc/topics/releases/version_numbers.rst
 2016-11-28 10:52:52 -07:00
Erik Johnson
4cdc6cf5ec Update earlier release channels' docs with Carbon release notes (#37914) 
* Update reference to Carbon in vsphere docs

* Replace reference to Carbon in top file merging docs

* Include Carbon version number

* Replace references to Carbon with 2016.11.0
 2016-11-28 10:33:31 -07:00
Benjamin Drung
9a51ba5c5b Fix various spelling mistakes 2016-11-24 16:00:31 +01:00
rallytime
3d6d32edc5 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - doc/topics/development/contributing.rst
 2016-11-21 17:29:07 -07:00
Nicole Thomas
0e74bad284 Update branch refs to more relevant branch (#37826) 
And cleanup some :ref: links that are rendering incorrectly
 2016-11-21 16:41:02 -07:00
Nicole Thomas
c300863159 Add some dependency documentation to libvirt docs (#37820) 
Fixes #5999
 2016-11-21 15:15:20 -07:00
Nicole Thomas
4910912ffa Update orchestrate runner file.copy doc example (#37817) 
The kwarg arguments should be a dictionary, and not a list.

Fixes #37383
 2016-11-21 13:23:08 -07:00
Adrian Todorov
ca3b6e7874 Update proxmox.rst with more options and LXC 2016-11-21 10:26:59 -07:00
Erik Johnson
62f998d013 Update RST and release notes for Carbon release (#37715) 
Since v2016.11.0rc2 will not become v2016.11.0, the docs needed to be
updated regarding a bugfix that was originally slated for 2016.11.1
since it came after RC2 was cut.
 2016-11-15 16:51:31 -07:00
rallytime
0e332ab591 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/cli/batch.py
  - salt/cli/salt.py
  - salt/transport/client.py
  - salt/utils/vmware.py
  - tests/integration/modules/sysmod.py
 2016-11-14 09:14:00 -07:00
Mike Place
a97c2ad34b Merge pull request #37640 from rallytime/update-release-notes 
Add known issue #37541 to 2016.3.4 release notes
 2016-11-12 09:28:12 +13:00
rallytime
6d6de12aff Grammatical fix 2016-11-11 11:03:57 -07:00
C. R. Oldham
1ca5b958c6 Forward-port change from 2015.8 adding release note for rotate_aes_key 2016-11-11 10:36:47 -07:00
C. R. Oldham
a01b66556f Add docs for rotate_aes_key (#37641) 2016-11-11 10:30:46 -07:00
rallytime
24d7f20e16 Add known issue #37541 to 2016.3.4 release notes 
Refs #37541
 2016-11-11 09:46:28 -07:00
rallytime
4c245a3fa5 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/modules/x509.py
 2016-11-10 16:51:52 -07:00
Nicole Thomas
8ba9ceda50 Merge pull request #37609 from rallytime/merge-2016.11 
[2016.11] Merge forward from carbon to 2016.11
 2016-11-10 15:48:43 -07:00
Nicole Thomas
06786f9617 Remove the v from the tag reference (#37595) 
When installing with pip, we just need the package version. No `v`.
 2016-11-10 09:41:34 -07:00
Aditya Kulkarni
a7e09f9260 Use existing VM's VDD size if not specified in the cloud profile (#37579) 2016-11-10 09:41:11 -07:00
Clint Armstrong
928462df1d fix example of function argument limiting (#37584) 2016-11-09 13:37:18 -07:00
rallytime
f44e14b63c Merge branch 'carbon' into '2016.11' 
Conflicts:
  - salt/modules/file.py
 2016-11-09 12:56:58 -07:00
Nicole Thomas
7036707fbf Back-port #37569 and #37581 to 2016.11 (#37585) 
* Remove known issues section for rc2

All of these have been fixed in the latest rc

* Add smartOS RC build instructions back to RC docs

And update the links to the new packages
 2016-11-09 10:39:07 -07:00
Nicole Thomas
b24992ea38 Update release candidate docs with RC2 info (#37568) 2016-11-09 10:19:11 -07:00
rallytime
5ead1425d7 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - doc/topics/releases/releasecandidate.rst
  - salt/modules/win_servermanager.py
 2016-11-08 13:04:33 -07:00
Jonathan Ballet
89b9417605 Documentation rendering fixes (#37543) 
* doc: fix documentation rendering of salt.runners.survey

* doc: fix Sphinx documentation warnings
 2016-11-08 09:42:12 -07:00
Ronald van Zantvoort
ae4e86ccc2 modify docs to utilize backend:requests 2016-11-07 22:28:32 +01:00
rallytime
eae3b9e30f Merge branch 'carbon' into '2016.11' 
No conflicts.
 2016-11-07 08:15:42 -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
Mike Place
2758e74785
Clarify docs on salt-key events 
Closes #37448
 2016-11-07 13:03:40 +13:00
Erik Johnson
c08038d9ea Update 2016.3.5 release notes with source_hash_name explanation 2016-11-06 11:53:41 -06:00
rallytime
9b3e4414c8 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - pkg/windows/modules/get-settings.psm1
  - salt/modules/mac_power.py
  - salt/modules/win_dsc.py
  - salt/modules/win_servermanager.py
  - salt/states/file.py
  - salt/utils/event.py
  - salt/utils/gitfs.py
 2016-11-04 15:23:49 -06:00
twangboy
9e0631a1ae Add docs denoting the requirement for at least PowerShell 3 2016-11-04 14:04:43 -07:00
Nicole Thomas
8aa101a99c Get release notes started for 2016.3.5 (#37485) 2016-11-04 14:22:26 -06:00
rallytime
4132929832 Merge branch 'carbon' into '2016.11' 
No conflicts.
 2016-11-04 13:38:34 -06:00
rallytime
c31f879f8b Merge branch '2016.3' into 'carbon' 
Conflicts:
  - salt/cloud/clouds/vmware.py
 2016-11-02 11:33:21 -06:00
Mike Place
9446e48da0 Merge pull request #37350 from pass-by-value/full_and_linked_clone_v1 
Add handling for full and linked clone
 2016-11-02 21:02:29 +13:00
Erik Johnson
3014afd517 Overhaul archive.extracted state 
This fixes a number of annoyances with the archive.extracted state.
Rather than re-state the changes again here, they can be observed in the
carbon release notes, where they have been documented.
 2016-11-01 19:35:57 -05:00
rallytime
6332da5c44 Prep release notes for 2016.11 2016-10-31 13:05:24 -06:00
rallytime
d4364d284a Officially update version.py for carbon to be 2016.11.0 2016-10-31 11:46:00 -06:00
Aditya Kulkarni
d8b1c9c777 Add handling for full and linked clone 
and commit disk mode additions
 2016-10-31 12:30:49 -04:00
rallytime
e10058c831 Merge branch '2016.3' into 'carbon' 
No conflicts.
 2016-10-31 10:15:25 -06:00
rallytime
39459ed30b Document the existence of placementgroup option in ec2 driver 2016-10-28 12:51:46 -06:00
rallytime
0df3feec3c Merge branch '2016.3' into 'carbon' 
No conflicts.
 2016-10-28 09:25:00 -06:00
Nicole Thomas
7d79ea7844 Update 2016.3.4 release notes (#37285) 2016-10-27 16:07:56 -06:00
rallytime
c722a18468 Update Carbon versionadded tags to 2016.11.0 in doc/* 2016-10-27 15:26:30 -06:00
Justin Findlay
a2eae208c5 update 2016.3.4 release notes (#37278) 2016-10-27 10:18:18 -06:00
rallytime
f2fc207d4f Update Carbon versionadded tags to 2016.11.0 in thorium files 2016-10-27 10:11:58 -06:00
Mike Place
afd3dc3807
Merge branch '2016.3' into 2016_3_carbon 2016-10-26 14:08:03 +09:00
Aditya Kulkarni
f64ca3c442 Update release notes and version added 2016-10-25 16:16:46 -06:00
Aditya Kulkarni
0a3d266d6b Add ability to specify disk backing mode for VMware cloud profile 2016-10-25 16:15:30 -06:00
Eric Radman
3829b7592f Update configuration examples for Joyent 
* Fix typo in profile example ('private_key' listed twice)
* Reflect Joyent's current new naming convention for VM sizes
* Update docs with modern images that are officially supported by Joyent
* Refresh example output of --list-sizes and --list-images
 2016-10-25 10:43:32 -06:00
rallytime
caa8fc9169 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - pkg/deb/salt-api.service
  - pkg/deb/salt-master.service
  - salt/client/__init__.py
  - salt/fileclient.py
  - salt/modules/cp.py
  - salt/modules/status.py
  - tests/integration/__init__.py
  - tests/integration/modules/cp.py
 2016-10-21 15:50:03 -06:00
Nicole Thomas
ec7ad9eebe Add note about salt-bootstrap known issue for 2016.3.4 (#37152) 
* Add note about salt-bootstrap known issue for 2016.3.4

Refs https://github.com/saltstack/salt-bootstrap/issues/973

* Add bootstrap release known issue to 2016.3.3 release notes, too.
 2016-10-21 14:46:35 -06:00
Jacob Hammons
7f968ddb72 Remove master installation instructions on Windows 2016-10-20 16:24:06 -07:00
Justin Findlay
426384909d add 2016.3.4 release notes (#37125) 2016-10-20 15:03:03 -06:00
rallytime
b445a5e579 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/modules/cp.py
 2016-10-19 18:24:04 -06:00
rallytime
a7dda5706e Merge branch '2016.3' into 'carbon' 
Conflicts:
  - salt/modules/cmdmod.py
  - salt/modules/win_service.py
  - salt/modules/x509.py
  - salt/utils/__init__.py
  - tests/unit/modules/win_service_test.py
 2016-10-19 18:20:04 -06:00
Erik Johnson
68eeb29783 Add warning about GitPython 2.0.9 incompatibility with Python 2.6 (#37099) 2016-10-19 18:06:07 -06:00
Justin Findlay
7328df68f5 doc.topic.tutorials.http.query: add proxy section 2016-10-18 10:50:37 -06:00
Justin Findlay
331072b35d doc.topic.tutorials.http.query: add subheadings 2016-10-18 10:50:37 -06:00
rallytime
b8e215d358 Merge branch '2016.3' into 'carbon' 
No conflicts.
 2016-10-18 09:23:58 -06:00
rallytime
78617b4a21 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - salt/cloud/clouds/profitbricks.py
  - salt/modules/cmdmod.py
  - salt/modules/file.py
 2016-10-18 09:22:18 -06:00
rallytime
78a144f19a Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-10-18 09:16:21 -06:00
Erik Johnson
854586c6a4 Add one more paragraph 2016-10-17 17:20:57 -05:00
Erik Johnson
a0502a7b90 Restructure grain writing docs 
Some information recently added is a little redundant. This commit edits
it and restructures the information to make it flow better.
 2016-10-17 17:03:05 -05: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
Erik Johnson
4e419e90ac Further clarification on new grains docs from #37028 2016-10-17 11:44:35 -05:00
rallytime
41b248394f Merge branch '2016.3' into 'carbon' 
Conflicts:
  - salt/pillar/__init__.py
 2016-10-17 09:09:16 -06:00
Damon Atkins
01e83a715e doc/topics/grains Update doco on when a grain should be created 2016-10-17 16:59:15 +11:00
Damon Atkins
a0e1fcc951 Add information to consider before adding a Grain to doco's for Grains 2016-10-16 01:17:38 +11:00
rallytime
112dc5d9c1 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - salt/cli/salt.py
  - salt/client/__init__.py
  - salt/modules/archive.py
  - tests/integration/modules/pkg.py
 2016-10-14 12:03:08 -06:00
Thomas S Hatch
8b3e65448d Merge pull request #36808 from gtmanfred/beacons 
allow for closing stuff in beacons
 2016-10-14 09:50:08 -06:00
rallytime
1d3aaf8097 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - doc/ref/configuration/minion.rst
 2016-10-12 15:26:27 -06:00
Vitaliy Fuks
e7da7b8442 Typos are not fun! 2016-10-12 10:38:07 -06:00
Michał Sochoń
94c97ee726 Update tutorial.rst 
Fix error in the list.
 2016-10-12 10:34:28 -06:00
Jacob Hammons
dd21da4992 Add autodoc topics for new modules added in Carbon (#36933) 
Module formatting issues
Add list of new Carbon modules to release notes
 2016-10-12 09:31:07 -06:00
Nicole Thomas
288f437d5e [2016.3] Remove "Targeting with Executions" section from docs (#36926) 
The targeting docs were refactored in the 2016.3 branch compared to
the 2015.8 branch. This fixes #36906 for the 2016.3 branch and newer.

Refs #36925
 2016-10-11 16:34:08 -06:00
Erik Johnson
e5425f3e8c Revert change in default value for top_file_merging_strategy (#36922) 
This causes problems when a Carbon master tries to run states on a
non-Carbon minion.
 2016-10-11 16:33:23 -06:00
Jacob Hammons
102f909bb4 Add FreeBSD and SmartOS to RC packages list (#36916) 2016-10-11 16:30:50 -06:00
Daniel Wallace
727d4f309a allow for closing stuff in beacons 
Like the filehandler for inotify
 2016-10-11 12:34:42 -05:00
Jacob Hammons
dff93f89ff Update list of RC build platforms, fix example (#36887) 2016-10-10 11:36:48 -06:00
rallytime
9ae34b2329 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - doc/topics/beacons/index.rst
 2016-10-10 10:19:50 -06:00
Jacob Hammons
d179423a23 Doc updates for Carbon release candidate (#36847) 2016-10-07 13:50:03 -06:00
Justin Findlay
b2eccdefd5 doc.topics.beacons: reflow text at 80 chars 2016-10-06 17:06:10 -06:00
Justin Findlay
b181f9890d doc.topics.{reactor|beacons}: unify examples, many minor edits 2016-10-06 17:06:10 -06:00
Mike Place
7b43d4322c
Merge branch '2016.3' into 2016_3_carbon 2016-09-27 16:44:42 +09:00
Mike Place
1e6a60ab01
Update boostrap docs to recent versions of Ubuntu 
Closes #36586
 2016-09-27 15:17:58 +09:00
rallytime
d0ec4ead2a Merge branch '2016.3' into 'carbon' 
No conflicts.
 2016-09-23 08:32:17 -06:00
Erik Johnson
2df51ce3e9 Rewrite minionfs walkthrough 
This walkthrough did not reflect the blacklist/whitelist or mountpoint
features, this commit rewrites it.
 2016-09-22 18:23:32 -05:00
rallytime
1755f22de1 Merge branch '2016.3' into 'carbon' 
No conflicts.
 2016-09-22 10:01:17 -06:00
Mike Place
ec4f4f49ca Merge pull request #36478 from rallytime/fix-36475 
Add the "bash" option to the "code-block"directive.
 2016-09-22 13:15:14 +09:00
Erik Johnson
4839c325ae Improve the rebase docs in contributing guidelines 
These docs do not tell people how to deal with branch diversions which
happen as a result of a rebase, and could lead (let's be real, probably
_has led_) to users pulling/merging, which will add a buttload of
unrelated commits to their pull request.

This update shows how to force-push when necessary.
 2016-09-21 13:53:27 -05: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
rallytime
7be7d5832f Add the "bash" option to the "code-block"directive. 
Fixes #36475

By adding the "bash" argument, we avoid the following error and the docs
will display appropriately:
```
/root/SaltStack/salt/doc/topics/tutorials/gitfs.rst:918: ERROR: Error in "code-block" directive:
1 argument(s) required, 0 supplied.

.. code-block::

    Cmnd_Alias SALT_GIT_HOOK = /bin/salt-call event.fire_master update salt/fileserver/gitfs/update
    Defaults!SALT_GIT_HOOK !requiretty
    ALL ALL=(root) NOPASSWD: SALT_GIT_HOOK
```
 2016-09-21 10:17:10 -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
7bcbf8dc36 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - doc/faq.rst
  - salt/modules/win_service.py
 2016-09-20 10:43:55 -06:00
Rajvi Dhimar
bb439eacde Update carbon.rst 2016-09-19 14:33:12 -06:00
Oz N Tiram
ffdebf7a25 Fix a minor typo in docs 2016-09-19 14:30:34 -06:00
rallytime
2f9c4268f7 Merge branch '2016.3' into 'carbon' 
No conflicts.
 2016-09-19 11:21:55 -06:00
Aditya Kulkarni
5737b1c409 Update versionadded and release notes (#36352) 2016-09-16 14:33:32 -06:00
rallytime
26cf545d03 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - salt/utils/gitfs.py
  - tests/unit/modules/disk_test.py
 2016-09-16 10:35:49 -06:00
Joseph Hall
2a77316123 Update usage docs for Thorium (#36368) 2016-09-16 09:52:47 -06:00
Erik Johnson
b815c98577 Add note about yumpkg.check_db removal in Boron 
Resolves #36292.
 2016-09-15 15:30:07 -05:00
rallytime
95dbe1ade4 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - salt/fileserver/__init__.py
  - setup.py
  - tests/integration/modules/git.py
 2016-09-14 09:15:29 -06:00
Aditya Kulkarni
d96981639b Add ability to clone from a snapshot to salt-cloud vmware driver 2016-09-12 14:49:20 -04:00
rallytime
6da0fbbe96 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - salt/modules/cmdmod.py
  - salt/modules/linux_sysctl.py
  - tests/unit/cloud/clouds/dimensiondata_test.py
  - tests/unit/cloud/clouds/gce_test.py
  - tests/unit/modules/boto_iot_test.py
  - tests/unit/modules/mount_test.py
  - tests/unit/states/boto_iot_test.py
  - tests/unit/utils/network.py
 2016-09-08 16:14:04 -06:00
Nicole Thomas
3445a333d5 Remove unclosed backticks in walkthrough doc (#36170) 2016-09-08 15:49:01 -06:00
Jacob Hammons
ecb0979be7 Adds #36055 to release notes 2016-09-08 11:10:56 -06:00
Erik Johnson
a3442a88ed Update docs on run_run_plus 2016-09-03 14:59:04 -05:00
Nicole Thomas
95591c2fe6 Add documentation about salt_interface to EC2 docs (#36015) 
Fixes #35618
 2016-09-02 14:37:04 -06:00
Nicole Thomas
86e5edfd0a Add persist deprecation from win_useradd to Carbon release notes (#36001) 2016-09-01 11:53:25 -06:00
Mike Place
2e76f73ea1 Merge pull request #35918 from rallytime/fix-18614 
Remove the compact outputter
 2016-09-02 00:49:43 +09:00
Mike Place
f115e6fc8f Merge pull request #35919 from rallytime/fix-35618 
Add documentation about salt_interface to EC2 docs
 2016-09-02 00:20:27 +09:00
rallytime
ae595537ff Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/modules/pkgng.py
 2016-08-31 16:39:54 -06:00
Thomas S Hatch
5aaad9e42e Merge pull request #35714 from rallytime/file_module_deprecations 
Remove the file.grep Carbon warning for multiple command line args
 2016-08-31 14:53:13 -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
ef2871c357 Add documentation about salt_interface to EC2 docs 
Fixes #35618
 2016-08-30 15:23:50 -06:00
rallytime
eed0a9d23d Remove the compact outputter 
This outputter was originally introduced in the 2014.7 branch, but
quickly regressed and never worked in a released version of Salt. Since
then, its existence has caused much confusion. In addition, this
outputter actually was supposed to accomplish the same thing as setting
"state_verbose" to False. Therefore, it doesn't make sense to maintain
two outputters (this one and the highstate outputter).

Fixes #18614
 2016-08-30 14:16:59 -06:00
Erik Johnson
a72fcf6aad Add versionadded for args event docs 2016-08-30 00:48:06 -05:00
Erik Johnson
c6cdb049fc Add documentation for runner events 2016-08-30 00:46:29 -05:00
rallytime
2b1ad9e9b9 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/utils/gitfs.py
 2016-08-26 14:54:54 -06:00
rallytime
e8e73b55ac Merge branch '2015.8' into '2016.3' 
Conflicts:
  - doc/topics/jobs/schedule.rst
  - salt/states/user.py
 2016-08-26 13:21:12 -06:00
Todd Wells
e212c55b7a Schedule documentation update (#35745) 
* Scheduling jobs add state and module options

* Scheduling jobs doc formatting
 2016-08-26 10:47:04 -06:00
rallytime
6464236f68 Merge branch '2016.3' into 'develop' 
Conflicts:
  - doc/conf.py
  - doc/ref/returners/index.rst
  - salt/states/disk.py
 2016-08-25 16:09:01 -06:00
Nicole Thomas
cd90052187 Documentation spelling fixes (#35773) 
Fixes #35771
 2016-08-25 13:41:03 -06:00
Nicole Thomas
0546b76d63 Revert "Template context must be populated with key:value pairs" (#35770) 2016-08-25 11:31:04 -06:00
Mike Place
bd0790f5f7 Merge pull request #35374 from cachedout/issue_34434 
Allow for additional module validation functions.
 2016-08-24 17:32:54 +09:00
Mike Place
a6eaa277c3 Merge pull request #35707 from rallytime/jobs_runner_deprecations 
Remove outputter kwarg from jobs runner. It has been deprecated.
 2016-08-24 16:41:10 +09:00
rallytime
6bd0f98062 Remove the file.grep Carbon warning for multiple command line args 2016-08-23 14:28:21 -06:00
rallytime
adc4e0fdfe Template context must be populated with key:value pairs 
This situation has been on deprecation warning for a while to allow
people time to update their state files. For the Carbon release, we
are switching the warnings over to raise SaltInvocationErrors.
 2016-08-23 14:07:39 -06:00
rallytime
caa113d390 Remove outputter kwarg from jobs runner. It has been deprecated. 2016-08-23 13:32:59 -06:00
rallytime
b80ef26cf2 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/cli/batch.py
  - salt/minion.py
  - salt/modules/cassandra_cql.py
  - salt/modules/rsync.py
 2016-08-23 10:44:55 -06:00
Mike Place
b3f2410fe9 Docs 2016-08-23 18:12:09 +09:00
rallytime
1d819d7cc2 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-08-22 09:29:13 -06:00
Nicole Thomas
92ecbc3b26 Remove deprecated version of status.uptime module function (#35535) 
* Remove the deprecated version of the status.uptime function.

The deprecated version of the function was set to be removed in
Carbon. The Carbon release notes were also updated with this change.

* Remove test_deprecated_uptime unit test

The deprecated version of uptime no longer exists.

* Remove unused import and deprecated uptime reference
 2016-08-22 09:25:21 -06:00
Mike Place
45a12ccaf0 Add Nitrogen release notes and remove deprecation warning for core grains 
We can't have a deprecation warning thrown for grains on every single salt-call.
That's just too much. Documenting in the release notes will be fine.
 2016-08-22 11:52:01 +09:00
Mike Place
2876e67ac4 Merge pull request #35530 from rallytime/remove_add_proxymodule_to_opts 
Remove add_proxymodule_to_opts from minion.py in Carbon
 2016-08-20 11:33:40 +09:00
Mike Place
05ea6b7083 Merge pull request #35532 from rallytime/remove_parse_args_and_kwargs 
Remove the parse_args_and_kwargs function from minion.py
 2016-08-20 11:32:31 +09:00
Nicole Thomas
399e9f57cc Update release notes for 2015.8.12 (#35614) 2016-08-19 16:13:08 -06:00
rallytime
f2eb625778 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-08-19 11:13:15 -06:00
Nicole Thomas
21c9c2d025 Make sure version label is correct in header (#35603) 2016-08-19 10:29:58 -06:00
Nicole Thomas
83425274f5 Update release notes for 2016.3.3 (#35602) 2016-08-19 10:27:34 -06:00
Nicole Thomas
0c7aa802f5 Update release notes for 2015.8.12 (#35600) 2016-08-19 10:13:41 -06:00
Nicole Thomas
dd12b48239 Update release notes for 2015.8.12 (#35599) 2016-08-19 09:59:31 -06:00
Erik Johnson
fd08d33597 Add warning about AWS flagging of nmap usage (#35575) 
* Add warning about AWS flagging of nmap usage

Also improve the verification examples overall, and add a note about the
fingerprint display difference beginning in OpenSSH 6.8.

* Remove "as root"

For some reason, when I was running the test in the example, I wasn't
getting the script output for the host key, unless I ran as root. Don't
know why this was the case but I can't reproduce it now. Removing this
as it is not accurate.

Also added a port number to the example as well since it speeds up the
nmap command.
 2016-08-18 17:00:02 -06:00
Mike Place
9279d6b6eb Merge pull request #35496 from StackPointCloud/profitbricks-cloud-improvements 
ProfitBricks cloud provider features and improvements
 2016-08-18 09:39:02 +09:00
rallytime
c2cc4f13a3 Remove the parse_args_and_kwargs function from minion.py 
It is deprecated and marked for removal in Carbon.
 2016-08-17 12:41:23 -06:00
rallytime
376976a19b Remove add_proxymodule_to_opts from minion.py in Carbon 
Also remove relevant documentation references - these config settings
are no longer needed.
 2016-08-17 12:22:25 -06:00
Ethan Devenport
de42b0135c Added new features and improvements to the ProfitBricks provider including: 
* Refactored LAN and NIC provisioning to use a more efficient composite server request.
* Added support for new INTEL_XEON and AMD_OPTERON CPU family types.
* Allow additional data volumes can be created and attached to servers.
* Added public and private network firewall rules.
* Added preliminary support for loadbalancers CLI functions.
* Corrected ProfitBricks name topic index.
* Updated ProfitBricks provider documentation.
* Updated provider integration test configs.
* PEP8 clean up.
 2016-08-16 20:07:42 +00:00
rallytime
45e1424ba3 Remove the env and activate kwargs from pip install/ed functions 
These options have been marked for deprecation in Carbon. The bin_env
option replaces both of these keyword agrs in the pip execution module
as well as the pip state.
 2016-08-16 11:06:20 -06:00
Mike Place
e3858d8f80 Merge pull request #35400 from thatch45/snapper_states 
Introduce rollback to Salt States
 2016-08-16 12:04:39 +09:00
rallytime
d17fbe96de LXC execution module Carbon deprecations 2016-08-15 16:28:23 -06:00
Thomas S Hatch
89a0f0ddc4 Add to release notes, snapper! 2016-08-11 16:00:25 -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
Mike Place
dfac0dec9f Merge pull request #35368 from rallytime/file-module-deprecations 
Remove contains_regex_multiline function from file module
 2016-08-11 09:36:02 +09:00
Mike Place
354da71209 Merge pull request #35361 from rallytime/blockdev-deprecations 
Blockdev deprecations
 2016-08-11 09:35:04 +09:00
rallytime
102fcbe916 Remove contains_regex_multiline function from file module 2016-08-10 16:43:49 -06:00
rallytime
8083c97786 Remove the vsphere.rst docs for Carbon 
Forgot to remove this file when removing the vsphere cloud driver
in #35248.
 2016-08-10 16:16:29 -06:00
rallytime
96bc36ca2e Remove deprecated functions from blockdev module 2016-08-10 10:37:14 -06:00
Mike Place
2c6f785bfa Merge pull request #35283 from twangboy/windows_build_scripts 
Add Salt-Master to Installer for Windows
 2016-08-10 20:46:42 +09:00