Nicole Thomas
8aa101a99c
Get release notes started for 2016.3.5 ( #37485 )
2016-11-04 14:22:26 -06:00
Nicole Thomas
dfd94959b6
[2016.3] Doc version updated to 2016.3.4 ( #37483 )
2016-11-04 14:12:19 -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
Aditya Kulkarni
d8b1c9c777
Add handling for full and linked clone
...
and commit disk mode additions
2016-10-31 12:30:49 -04:00
rallytime
39459ed30b
Document the existence of placementgroup option in ec2 driver
2016-10-28 12:51:46 -06:00
Nicole Thomas
7d79ea7844
Update 2016.3.4 release notes ( #37285 )
2016-10-27 16:07:56 -06:00
Justin Findlay
a2eae208c5
update 2016.3.4 release notes ( #37278 )
2016-10-27 10:18:18 -06:00
Nicole Thomas
47290d88a2
Update man pages for the 2016.3 branch ( #37259 )
2016-10-26 13:32:38 -06: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
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
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
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
Justin Findlay
478def4923
doc.ref.configuration.minion: add proxy vars
2016-10-18 10:50:37 -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
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
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
5362e5183e
Merge branch '2015.8' into '2016.3'
...
Conflicts:
- doc/ref/cli/index.rst
2016-10-12 12:36:00 -06:00
Nicole Thomas
7e2128c05d
Merge pull request #36948 from rallytime/bp-36943
...
Back-port #36943 to 2016.3
2016-10-12 12:33:02 -06:00
Mate Ory
d2f8f18430
doc: document what the argument of salt --subset means
2016-10-12 10:42:31 -06:00
Michał Sochoń
94c97ee726
Update tutorial.rst
...
Fix error in the list.
2016-10-12 10:34:28 -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
Nicole Thomas
7838d8d3f9
Remove "Targeting with Executions" section from docs ( #36925 )
...
This feature was removed long ago and is no longer under development.
Fixes #36906
2016-10-11 16:33:56 -06:00
Erik Johnson
a56bf8bd2d
Update references to future default value change that was reverted ( #36924 )
2016-10-11 16:33:41 -06:00
Daniel Wallace
727d4f309a
allow for closing stuff in beacons
...
Like the filehandler for inotify
2016-10-11 12:34:42 -05: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
Justin Findlay
28b4e30009
doc.glossary: use parenthesis
2016-10-06 16:17:22 -06:00
Justin Findlay
82cf39db00
doc.glossary: add JID
2016-10-06 16:17:22 -06:00
Justin Findlay
cc071b75cb
doc.glossary: add idempotent
2016-10-06 16:17:22 -06:00
Mike Place
4bdb997dae
Merge pull request #36785 from cachedout/pr-36728
...
Fixup merge forward #36728
2016-10-05 20:02:16 +09:00
rallytime
24b8bba145
Merge branch '2015.8' into '2016.3'
...
No conflicts.
2016-09-30 16:13:08 -06:00
Yoram Hekma
3bb2cb6379
Update doc to reflect the version where 'none' was added as a pillar_source_merging_strategy
2016-09-30 15:59:21 -06:00
Erik Johnson
3d15eedfe0
Add additional information about onchanges/onchanges_in
2016-09-29 23:02:39 -05:00
Erik Johnson
57ecbe6c53
Update minion restart example to use onchanges instead of cmd.wait
2016-09-29 23:02:10 -05:00
Justin Findlay
4dd4fc94dc
log levels doc: try long form table
...
sphinx didn't render the shorthand table
2016-09-29 10:11:06 -06:00
rallytime
da574e5b03
Merge branch '2015.8' into '2016.3'
...
Conflicts:
- salt/client/ssh/__init__.py
- salt/config/__init__.py
- salt/runners/thin.py
2016-09-28 09:01:24 -06:00
Bo Maryniuk
a441b35588
Add documentation about Salt Thin configuration
2016-09-27 11:12:07 +02:00
Mike Place
1e6a60ab01
Update boostrap docs to recent versions of Ubuntu
...
Closes #36586
2016-09-27 15:17:58 +09:00
Nicole Thomas
5548ed771d
Back-port #36435 to 2016.3 ( #36532 )
...
* Added "none" option for pillar_source_merging_strategy
* added none to merging strategy in dictupdate so we no longer log warnings when it is selected
* Updated documentation
* fix for when pillar_source_merging_strategy is not set
* Fix looking up pillar data when merging is set to "none" and no saltenv was passed
* Fix looking up pillar data when merging is set to "none" and no saltenv was passed retry
* Let's not break when no merging strategy is passed
* Capitalisation
* Update on doc
2016-09-23 13:36:23 -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