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
79,522 Commits 24 Branches 182 Tags 341 MiB
6c33e8ea6b
Commit Graph

7042 Commits

Author SHA1 Message Date
Mircea Ulinic
d743aff755 Document util filters 2017-01-18 15:01:05 +00:00
SaltyCharles
e127013892 update gitfs.rst for clarity 
Add note for "Unsupported URL Protocol" error when using pygit2 without libssh2.
 2017-01-17 15:44:00 -08: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
rallytime
5b43a252c9 Merge branch '2016.11' into 'develop' 
Conflicts:
  - conf/master
  - doc/topics/installation/ubuntu.rst
  - salt/modules/pillar.py
  - salt/netapi/rest_tornado/saltnado.py
  - salt/states/influxdb_user.py
  - salt/utils/minions.py
  - salt/utils/openstack/nova.py
 2017-01-17 09:50:06 -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
Eric Radman
17fc12175c Try to resolve guest IP if VMware Tools is not installed 
In some cases installation of VMware Tools is not possible. Enable
salt-cloud to bootstrap a minion by using DNS to resolve it's IP.
 2017-01-15 22:42:53 -05: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
Mike Place
909bb15873 Merge pull request #38673 from kyrias/por_doc 
ref/configuration/master: Document ping_on_rotate
 2017-01-15 11:01:18 -07:00
Mike Place
0ad5d22ad4 Merge pull request #38703 from yhekma/docfix 
The `test` option is only valid for the minion, not the master
 2017-01-15 10:56:22 -07:00
Mike Place
ffae20ee58 Merge pull request #38686 from cloudflare/STATUSPAGE-STATE 
New state: statuspage
 2017-01-15 07:51:35 -07:00
Mike Place
f4233bb18d Merge pull request #38739 from vutny/fix-runtests-doc 
DOCS: correct examples of running test suite
 2017-01-15 07:35:47 -07:00
Denys Havrysh
b872bb63f6 DOCS: correct examples of running test suite 2017-01-15 11:48:04 +02:00
Denys Havrysh
51d4707071 DOCS: add links to File State Backups page where necessary (#38735) 2017-01-14 11:49:21 -07:00
Zac Brachmanis
7ca256ccee Minor spelling correction (#38721) 2017-01-13 14:57:20 -07: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
Yoram Hekma
57df3bf148 The test option is only valid for the minion, not the master 2017-01-12 09:13:46 +01:00
Mircea Ulinic
5cf9c3e205
Statuspage state doc 2017-01-11 14:06:58 +00:00
Johannes Löthberg
2ac3da8d03 ref/configuration/master: Document ping_on_rotate 
Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
 2017-01-10 23:01:06 +01: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
d4f8f4ca7a Merge branch '2016.11' into 'develop' 
No conflicts.
 2017-01-09 11:57:28 -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
Mike Place
993596b10a Merge pull request #38218 from rallytime/cmd-run-alias-deprecation 
Remove support for aliasing cmd.run to cmd.shell
 2017-01-06 14:36:18 -07:00
Mike Place
791499c813 Merge pull request #38620 from rallytime/merge-develop 
[develop] Merge forward from 2016.11 to develop
 2017-01-06 10:50:58 -07:00
Mike Place
e2c8f7a844 Merge pull request #38588 from cloudflare/STATUSPAGE-MOD 
New execution module: statuspage
 2017-01-06 10:29:13 -07:00
rallytime
87af1f1e5a Remove support for aliasing cmd.run to cmd.shell 2017-01-06 11:46:47 -05:00
rallytime
342a5ac0b8 Merge branch '2016.11' into 'develop' 
No conflicts.
 2017-01-06 10:31:51 -05:00
Super-User
fbdd32f46b add note related to issue #37027 2017-01-06 15:25:51 +01:00
Mike Place
6646a95c1e Merge pull request #38490 from eradman/cloud_config 
Change map and profile extends merge strategy to use recursive update
 2017-01-05 16:35:41 -07:00
Mircea Ulinic
515c6643c9
StatusPage module doc 2017-01-05 18:02:13 +00: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
Mike Place
4723d26105 Merge pull request #38564 from rdutch/update_orchestration_docs 
Update orchestration docs with runner explanation.
 2017-01-04 12:56:34 -07:00
Eric Radman
3ec910cf34 Change map and profile extends merge strategy to use recursive update 
Previously only top-level data elements could be overridden in a map or
extended profile entry. This change adjusts map and profile evaluation
to use a recursive merge using salt.utils.dictupdate.update().

This is a break with compatibility, but in the common case a cloud
profile or map is not structured to truncate configuration but to add
further detail to the profile that it extends.

Update map docs with an example from VMware where we chan now change a
network parameter without having to repeat other device information such
as disk controllers.
 2017-01-04 14:11:53 -05:00
Mike Place
b1e21ed58d Merge pull request #38516 from Inveracity/patch-2 
include option for freeipa
 2017-01-04 11:54:59 -07:00
Hilberding, Rob
f83cc2993c Update orchestration docs with runner explanation. 2017-01-04 13:34:55 -05: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
rallytime
9ad362fbde Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/states/kapacitor.py
 2017-01-03 10:17:18 -05:00
Inveracity
f1c6fc30d1 include option for freeipa 
Updating docs to include freeipa per merge request #37219
 2017-01-02 14:15:42 +01:00
twangboy
e96bfe8fa2 Change OSX/OS X to macOS where possible 2016-12-28 14:49:46 -07:00
Dirk Heinrichs
362448789c Fix documentation reg. pkg.available_version. 2016-12-27 19:15:55 +01:00
Mike Place
acedf3e95b Merge pull request #38413 from eradman/map_docs 
Provide an example for overriding nested parameters in a map file
 2016-12-27 09:24:17 -07:00
Mike Place
34621930aa Merge pull request #38420 from rallytime/module-deprecations 
Removed various deprecation notices from salt/modules/* files
 2016-12-27 09:09:58 -07:00
Erik Johnson
4cbfa9d947 Add pillarenv_from_saltenv to pillar docs 2016-12-22 16:25:29 -06:00
rallytime
a2927226ea Merge branch '2016.11' into 'develop' 
Conflicts:
  - doc/ref/modules/all/salt.modules.napalm_route.rst
  - doc/ref/modules/all/salt.modules.napalm_snmp.rst
  - doc/ref/modules/all/salt.modules.napalm_users.rst
  - doc/ref/states/all/salt.states.netsnmp.rst
  - doc/ref/states/all/salt.states.netusers.rst
  - salt/states/cron.py
 2016-12-22 12:15:06 -07:00
rallytime
0a27f941f7 Removed various deprecation notices from salt/modules/* files 
Added docs to the release notes for all of these changes.

The affected modules are:

- htpasswd
- img
- smartos_virt
- virt
- virtualenc_mod
- xapi
- zypper
 2016-12-22 11:57:26 -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
Mike Place
16f35244f8 Merge pull request #38378 from rallytime/git-deprecations 
Remove functions and arguments in git state and execution module
 2016-12-22 09:47:10 -07:00
Mike Place
d10e3ece5a Merge pull request #38404 from terminalmage/pillarenv 
Add config option to pin pillarenv to effective saltenv
 2016-12-22 09:34:19 -07:00
Eric Radman
d0507375b9 Provide an example for overriding nested parameters in a map 
At first reading it appears that that any data element can be specified
individually in a map, but this is not the case. Under the hood, the map file is
merged with the profile configuration using dict.update().

Employ the term 'top level data element' from
https://github.com/saltstack/salt/issues/23416
 2016-12-22 10:22:22 -05:00
Erik Johnson
4049bf7288 Add pillarenv_from_saltenv to Nitrogen release notes 2016-12-21 19:54:48 -06:00
Erik Johnson
1fd9c716d9 Add pillarenv_from_saltenv minion config parameter 2016-12-21 19:49:32 -06:00
Mike Place
4d05dc5337 Merge pull request #38396 from gtmanfred/develop 
add travisci module
 2016-12-21 14:01:37 -07:00
rallytime
09a76a0a97 Remove functions and arguments in git state and execution module 
These were all marked for removal in Nitrogen
 2016-12-21 11:55:18 -07:00
Daniel Wallace
05574d4770 add travisci module 
Used to verify webhook post requests came from travis
 2016-12-21 12:42:09 -06:00
Mike Place
a21354dff1 Merge pull request #38379 from rallytime/event-utils-deprecations 
Remove use_pending and pending_tags from salt.utils.event.get_event function
 2016-12-21 11:26:48 -07:00
Mike Place
5b6e31d6fc Merge pull request #38380 from rallytime/glusterfs-deprecations 
Remove deprecated functions from glusterfs state and module
 2016-12-21 11:25:47 -07:00
Seth House
cad64a9264 Remove retrieving roles from nodegroups from docs as anti-pattern 2016-12-20 22:43:56 -07:00
rallytime
7ecd4e6e1b Remove deprecated functions from glusterfs state and module 2016-12-20 15:09:54 -07:00
rallytime
efc5378f3d Remove use_pending and pending_tags from salt.utils.event.get_event function 2016-12-20 15:01:40 -07:00
Mike Place
a9c2618c89 Merge pull request #38360 from rallytime/deprecate-apache-states 
Remove enable/disable funcs from apache_* states
 2016-12-20 13:37:14 -07:00
Mike Place
68430b1fa6 Merge pull request #38348 from rallytime/mod-docs-2016.11 
Update autodoc topics for new modules added in 2016.11
 2016-12-20 13:36:20 -07:00
rallytime
b31c2412ca Add __iter__ and next options to doc/conf.py 
This allows sphinx to build without autodoc errors on mock objects
that should be iterable.

Also added versionadded tags to the snapper module and state.
 2016-12-20 11:50:43 -07:00
rallytime
494a06bee2 Merge branch '2016.11' into 'develop' 
Conflicts:
  - doc/ref/configuration/minion.rst
 2016-12-20 10:03:44 -07:00
Dmitry Kuzmenko
dad748f57a Data cache plugin configuration documentation. 2016-12-20 19:32:48 +03:00
Mike Place
662d8d64a8 Merge pull request #38166 from rallytime/cloud-deprecations 
Remove support for "provider" in cloud provider configs
 2016-12-20 08:06:19 -07:00
Mike Place
9cd7b72442 Merge pull request #38359 from rallytime/remove-PidfileMixin 
Remove PidfileMixin as it is deprecated for removal in Nitrogen
 2016-12-20 06:48:20 -07:00
Mike Place
9350808fea Merge pull request #38361 from rallytime/deprecate-client_acl-client_acl_blacklist 
Remove support for client_acl and client_acl_blacklist
 2016-12-20 06:33:23 -07:00
rallytime
a9f85f0dbe Remove support for client_acl and client_acl_blacklist 
These have been deprecated for some time and were marked for
removal in Nitrogen.

publisher_acl and publisher_acl_blacklist should be used instead.
 2016-12-19 16:18:48 -07:00
rallytime
baf8f208eb Remove dup LXC doc reference 2016-12-19 15:49:37 -07:00
rallytime
810ed4a9cd Remove enable/disable funcs from apache_* states 
The apache_*.enable and apache_*.disable state functions are
deprecated in favor of apache_*.enabled and apache_*.disabled.
 2016-12-19 15:42:39 -07:00
rallytime
279cec88da Remove PidfileMixin as it is deprecated for removal in Nitrogen 2016-12-19 15:32:22 -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
rallytime
8f80916432 Merge branch '2016.11' into 'develop' 
Conflicts:
  - doc/ref/configuration/master.rst
  - doc/topics/cloud/index.rst
  - salt/states/cron.py
 2016-12-19 14:00:52 -07:00
rallytime
366271f459 Add snapper to state index doc module list 2016-12-19 10:32:44 -07:00
rallytime
135d254c80 Remove netapi autodoc files: they should not be added as their doc structure is different 2016-12-19 17:00:20 +00:00
rallytime
0006139aca Update autodoc topics for new modules added in 2016.11 2016-12-19 16:44:34 +00:00
Mike Place
86c53b8efd Merge pull request #38172 from rallytime/win-deprecations 
Remove support for deprecation options/functions in win* files
 2016-12-19 07:33:05 -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
Nicole Thomas
9e35f5dd08 Add azurearm module to doc index (#38322) 2016-12-16 14:44:20 -07:00
Mike Place
e937fa44e1 Merge pull request #38315 from sjorge/develop-zonecfg 
zonecfg module for Solaris 10 and compatible
 2016-12-16 12:08:00 -07:00
rallytime
05ec9f4b5b Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/netapi/rest_cherrypy/app.py
 2016-12-15 20:47:35 -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
78fe43124e Remove deprecated install and uninstall funcs from chocolatey state 
Use "installed" and "uninstalled" instead, respectively.
 2016-12-15 13:14:47 -07:00
rallytime
a9f90b881a Remove suport for the "win_repo", "win_repo_mastercachefile", and "win_gitrepos" options 
The "winrepo_dir", "winrepo_cachefile", and "winrepo_remotes"  options should be used instead,
respectively.
 2016-12-15 13:14:47 -07:00
rallytime
a55fc381dc Remove deprecated "win_repo_source_dir" in favor of "winrepo_source_dir" 2016-12-15 13:14:47 -07:00
Mike Place
ff93bfc189 Merge pull request #38255 from rallytime/pillar-deprecations 
Various pillar deprecations for Nitrogen
 2016-12-15 11:50:03 -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
Nicole Thomas
2e480cfb77 [develop] Bump latest release version to 2016.11.1 (#38258) 2016-12-14 16:29:02 -07:00
Nicole Thomas
702d46244b [2016.11] Bump latest release version to 2016.11.1 (#38257) 2016-12-14 16:28:39 -07:00
Nicole Thomas
6b9060c38f [2016.3] Bump latest release version to 2016.11.1 (#38256) 2016-12-14 16:28:19 -07:00
rallytime
56413cfb53 Various pillar deprecations for Nitrogen 
- Remove support for legacy sqlite3 pillar configuration
- Remove support for the "raw_data" kwarg in the file_tree external pillar
 2016-12-14 14:54:16 -07:00
rallytime
fe1e24909e Merge branch '2016.11' into 'develop' 
No conflicts.
 2016-12-13 11:29:16 -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
29f45c192c Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/cloud/clouds/ec2.py
  - salt/modules/grains.py
 2016-12-12 11:23:57 -07: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
Andreas Tsaridas
bbadac329c add doc for master config (#38189) 
* add doc for master config

* changes requested
 2016-12-09 17:23:06 -07:00
Megan Wilhite
f7294dc85b add 2016.11.1 changelog to release notes (#38186) 2016-12-09 15:44:09 -07:00
Mike Place
31180a4733 Merge pull request #38119 from sypets/documentation-requisites-overview-table 
documentation: added overview (table) of requisites to requisites doc
 2016-12-09 11:51:36 -07:00
rallytime
88936c2c84 Remove support for "provider" in cloud provider configs 
The "driver" key should now be used instead of "provider", as the
"provider" key should only be used is cloud profile config files.

Deprecations warnings have been in place for this change since Salt
2015.5.0 came out and were slated for removal in the ``Nitrogen``
release.
 2016-12-08 13:18:51 -07:00
Joseph Hall
71b787e250 Add Azure ARM docs for 2016.11.0 2016-12-08 12:43:18 -07:00
Mike Place
4991c922ae Merge pull request #38123 from Da-Juan/thorium_fix 
Thorium fixes
 2016-12-08 10:48:05 -07:00
Sybille Peters
9e53ddd3a9 added info for prereq, changed heading text and formatting 2016-12-08 09:53:57 +01:00
rallytime
4998b8d116 Merge branch '2016.11' into 'develop' 
Conflicts:
  - doc/ref/configuration/master.rst
  - doc/ref/peer.rst
  - doc/topics/reactor/index.rst
 2016-12-07 16:31:11 -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
Sybille Peters
94bd10ec12 changes for more clarity 2016-12-07 16:41:42 +01:00
Da-Juan
c3ec3df5f0 Fix typo in stanza name 
Fix statreg stanza name to match the require statement and the docs in
salt/thorium/key.py
 2016-12-07 14:23:03 +01:00
Sybille Peters
1964fcf638 documentation: added overview (table) of requisites to requisites doc 2016-12-07 10:57:02 +01: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
rallytime
9b2bbe77ef Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/modules/archive.py
  - salt/netapi/rest_tornado/saltnado.py
 2016-12-06 10:03:10 -07:00
Nicole Thomas
b7b0391da6 Add deprecation notices to nitrogen release notes (#38082) 2016-12-05 15:24:39 -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
Mircea Ulinic
3375e5fe30
netconfig state doc 2016-12-02 13:27:44 +00:00
Mike Place
03e0fd39d1 Merge pull request #37963 from terminalmage/tgt_type 
Deprecate expr_form argument in the LocalClient
 2016-12-02 02:45:16 -07:00
rallytime
0eab0ee8a6 Merge branch '2016.11' into 'develop' 
Conflicts:
  - doc/topics/releases/2016.11.0.rst
 2016-12-01 12:14:33 -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
6942d5d95b Merge pull request #37995 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-11-30 13:12:55 -07:00
Mike Place
69a74a4d2d Merge pull request #37950 from vutny/fix-starting-up-syndic 
Set default Salt Master address for a Syndic (like for a Minion)
 2016-11-30 11:09:03 -07:00
Erik Johnson
a74fc5bd47 Add expr_form deprecation to Nitrogen release notes 2016-11-30 11:57:40 -06:00
rallytime
b44e17921c Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-11-30 09:21:45 -07:00
Mike Place
8f351644b5 Merge pull request #37960 from rallytime/proxy-grains-merge-switch 
Switch proxy_merge_grains_in_module option default from False to True
 2016-11-30 09:00:56 -07:00
Denys Havrysh
7d9bc9abce syndic_master: correct default value, documentation and example config 2016-11-30 17:18:44 +02:00
Mike Place
ca3a9488f1 Merge pull request #37979 from terminalmage/revert-pillar-change 
Revert addition of pillar_roots_override_ext_pillar
 2016-11-30 07:34:23 -07:00
Erik Johnson
26600bcd0d Forgot a word in docs update 2016-11-29 15:52:04 -06:00
Erik Johnson
61ed9a8657 Add clarifying language to ext_pillar_first docs 
Also remove a sentence which may lead people to believe that they can
make git_pillar and pillar_roots share top/sls files and be compiled
together.
 2016-11-29 15:49:05 -06:00
Erik Johnson
6135dfa4dd Revert addition of pillar_roots_override_ext_pillar 
This turned out to be an unnecessary addition, as the root cause was
ext_pillar_first not behaving as documented.
 2016-11-29 15:35:04 -06:00
Nicole Thomas
186b3c7959 Fix RST link format (#37958) (#37970) 2016-11-29 14:34:07 -07:00
Nicole Thomas
2723188c6f Merge pull request #37956 from rallytime/merge-develop 
[develop] Merge forward from 2016.11 to develop
 2016-11-29 13:52:38 -07:00
Erik Johnson
7f269bc7f9 Add clarification on expr_form usage and future deprecation (#37964) 2016-11-29 13:45:11 -07:00
Mircea Ulinic
3cda665640 Fix RST link format (#37958) 2016-11-29 13:24:14 -07:00
Erik Johnson
f7acb34248 Deprecate expr_form argument in the LocalClient 
The published commands and the events all use tgt_type, expr_form is
only used in the LocalClient, which has been confusing to many users.
This puts expr_form on a deprecation path, allowing it to continue to be
supported while tgt_type becomes the new official argument name.
 2016-11-29 14:03:34 -06:00
rallytime
62e3c44045 Switch proxy_merge_grains_in_module option default from False to True 2016-11-29 10:51:46 -07:00
Mike Place
856407ee27 Merge pull request #37951 from gtmanfred/develop 
retry states didn't make it into carbon
 2016-11-29 09:51:21 -07:00
rallytime
4760455600 Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/grains/core.py
  - salt/modules/dockerng.py
  - tests/unit/modules/linux_acl_test.py
 2016-11-29 09:31:05 -07:00
Daniel Wallace
6658c2f12b retry states didn't make it into carbon 
Update the version to Nitrogen
 2016-11-29 10:09:47 -06:00
Mircea Ulinic
529b64dbeb
Inclued NAPALM in 2016.11 release notes 2016-11-29 13:46:45 +00:00
Mike Place
ea46639ce7 Merge pull request #37272 from vutny/fix-getting-default-logging-opts 
Get default logging level and log file from default opts dict
 2016-11-28 16:04:20 -07:00
Mike Place
76658631f9 Merge pull request #37904 from terminalmage/issue37698 
Add states to manage systemd masking
 2016-11-28 15:46:06 -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
Mike Place
44306dd8a5 Merge pull request #37913 from gtmanfred/develop 
Add ircbot engine for sending events to the reactor
 2016-11-28 13:38:11 -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
Daniel Wallace
4d9722fb45 Add ircbot engine for sending events to the reactor 
More to be added later like triggering commands from irc.
 2016-11-28 13:12:42 -06:00
rallytime
da7f5518eb Don't let 2016.3 doc config changes overwrite the 2016.11 changes 2016-11-28 11:09:35 -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
rallytime
b3340c3a73 Merge branch '2016.11' into 'develop' 
Conflicts:
  - doc/conf.py
  - salt/config/__init__.py
  - salt/minion.py
 2016-11-28 10:40:47 -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
Nicole Thomas
ab071f2636 [develop] Update version numbers in doc config for 2016.11.0 release (#37915) 2016-11-28 10:10:00 -07:00
Nicole Thomas
d31491a7fe [2015.8] Update version numbers in doc config for 2016.11.0 release (#37918) 2016-11-28 10:09:27 -07:00
Nicole Thomas
d204099db8 [2016.11] Update version numbers in doc config for 2016.11.0 release (#37917) 2016-11-28 10:08:52 -07:00
rallytime
bd40592289 [2016.3] Update version numbers in doc config for 2016.11.0 release 2016-11-28 09:18:38 -07:00
Erik Johnson
efb4dc1001 Add states to manage systemd masking 
This also changes how the systemd module handles masking, to accommodate
the fact that both indefinite and runtime masks can be set
simultaneously for the same service.
 2016-11-27 01:06:33 -06:00
Benjamin Drung
9a51ba5c5b Fix various spelling mistakes 2016-11-24 16:00:31 +01:00
Eric Radman
3f2e13d1fc Remove repeated words in docs (#37871) 
Found using

find . -name '*.rst' | xargs igor -R -r
 2016-11-23 14:53:17 -07:00
Erik Johnson
7c1cfa82e4 Clarify the master_type docs (#37841) 
Mention when "disable" began to be supported.
 2016-11-22 11:44:46 -07:00
rallytime
b1745b8ff9 Merge branch '2016.11' into 'develop' 
No conflicts.
 2016-11-22 08:57:23 -07:00
rallytime
ce384b5009 Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/config/__init__.py
 2016-11-21 17:30:59 -07: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
Adrian Todorov
e04f63d721 Update proxmox.rst with more options and LXC (#37790) 2016-11-21 09:22:47 -07:00
Dmitry Kuzmenko
6857b9b8b1 Documented new TLS/SSL settings. 2016-11-21 17:21:54 +03:00
Denys Havrysh
83d6a44254 Add ssh_log_file option to master config and documentation 2016-11-20 16:13:55 +02:00
Super-User
65ad8cc599 zonecfg scafolding 2016-11-19 14:51:55 +01:00
Denys Havrysh
c8a0915460 Fix configuration example and documentation for syndic_log_file option 2016-11-19 13:11:36 +02:00
Mike Place
473764d387 Merge pull request #37733 from gtmanfred/develop 
Add grains for the cloud metadata server
 2016-11-17 23:41:23 +00:00
Daniel Wallace
7b946e5fb9 add option required for metadata server grains 2016-11-17 10:12:43 -06:00
rallytime
5f4a73f880 Merge branch '2016.11' into 'develop' 
No conflicts.
 2016-11-16 08:55:22 -07:00
Mike Place
9fc2ceebd3 Merge pull request #37706 from cloudflare/TABLE-OUT 
New outputter: table
 2016-11-16 08:20:24 +00: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
Mircea Ulinic
07c66f3ff8
Table outputter doc 2016-11-15 16:29:30 +00:00
rallytime
1b5f89577e Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/cloud/clouds/vmware.py
 2016-11-14 09:19:49 -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
b049ad6ead Merge pull request #37658 from sjorge/develop-zoneadm 
Want a zoneadm module
 2016-11-12 20:32:05 +00:00
Oz N Tiram
1ac9b96a76 Update grains documentation 
Make it clear that changes to grains content require
 a refersh of modules.
 2016-11-12 10:45:39 +01: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
Nicole Thomas
f7f7b987b3 Merge pull request #37619 from rallytime/merge-develop 
[develop] Merge forward from 2016.11 to develop
 2016-11-11 11:44:09 -07: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
5340edb9bb Keep the 'develop' branch setting in doc conf 2016-11-11 09:04:12 -07:00
Eric Radman
9a60e298bb vmware: optionally allow network interface MAC to be set 
Example profile:

    network:
      Network Adapter 1:
        mac: '00:16:3e:e8:19:0f'
        name: vlan25
        switch_type: standard

This takes effect as soon as the VM is initialized, so PXE-booting can
take advantage of this.
 2016-11-10 19:59:55 -05:00
rallytime
4c245a3fa5 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/modules/x509.py
 2016-11-10 16:51:52 -07:00
rallytime
7b2341bbfd Merge branch '2016.11' into 'develop' 
Conflicts:
  - doc/topics/releases/releasecandidate.rst
  - salt/modules/file.py
  - salt/states/file.py
  - salt/utils/network.py
 2016-11-10 15:59:51 -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
eea781a9ac Update the docbuild settings for 2016.11 branch (#37606) 2016-11-10 10:47:25 -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
Nicole Thomas
2c6a8748fe Add smartOS RC build instructions back to RC docs (#37581) 
And update the links to the new packages
 2016-11-09 10:09:03 -07:00
Nicole Thomas
19dcace679 Remove known issues section for rc2 (#37569) 
All of these have been fixed in the latest rc
 2016-11-08 16:46:01 -07:00
Nicole Thomas
0564532924 Update release candidate docs with RC2 info (#37564) 2016-11-08 15:26:37 -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
Mike Place
8b0f280998 Merge pull request #37509 from Rumbles/rumbles 
Saltstack PPA is no longer maintained - update docs
 2016-11-08 13:27:14 +13:00
Mike Place
6d2b2e1881 Slight grammar fix 2016-11-08 13:27:06 +13:00
Ronald van Zantvoort
cb445550a6 typofix 2016-11-08 01:13:12 +01:00
Ronald van Zantvoort
ae4e86ccc2 modify docs to utilize backend:requests 2016-11-07 22:28:32 +01:00
rallytime
2e68da3e52 Merge branch '2016.11' into 'develop' 
Conflicts:
  - doc/topics/cloud/vmware.rst
  - salt/cloud/clouds/vmware.py
 2016-11-07 08:22:17 -07: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
James Stocker
83f01a2e5f Saltstack PPA is no longer maintained 2016-11-07 12:07:53 +00: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
Mike Place
706befd8ca Merge pull request #37476 from pakdel/ec2_cloud_driver_fix 
EC2 support for SubnetName and securityGroupName
 2016-11-06 14:43:09 +13:00
Super-User
2684319213 introduce zoneadm module, implements list 2016-11-05 13:19:36 +01:00
Nicole Thomas
029d822d92 Merge pull request #37480 from rallytime/merge-develop 
[develop] Merge forward from 2016.11 to develop
 2016-11-04 15:27:20 -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
Nicole Thomas
a330866a17 [develop] Doc version updated to 2016.3.4 (#37484) 2016-11-04 14:13:34 -06:00
Nicole Thomas
dfd94959b6 [2016.3] Doc version updated to 2016.3.4 (#37483) 2016-11-04 14:12:19 -06:00
Nicole Thomas
c505a059ef [2015.8] Doc version updated to 2016.3.4 (#37482) 2016-11-04 14:10:24 -06:00
rallytime
ce4b82fdee Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/modules/archive.py
  - salt/modules/status.py
  - salt/states/file.py
  - tests/unit/modules/status_test.py
 2016-11-04 13:51:46 -06:00
rallytime
4132929832 Merge branch 'carbon' into '2016.11' 
No conflicts.
 2016-11-04 13:38:34 -06:00
Amir Pakdel
783f58bf3d EC2 support for SubnetName and securityGroupName 
Now we can have subnetname and securitygroupname
in network_interfaces of EC2 cloud profiles:
profile_name:
  size: t2.medium
  network_interfaces:
  - DeviceIndex: 0
    allocate_new_eip: true
    subnetname: subnet01
    securitygroupname:
    - sgLinux
    - sgServer1
    - sgServer2
 2016-11-04 14:16:02 -04:00
Mike Place
d86ec7372f Merge pull request #37374 from cloudflare/NAPALM-USERS-MODULE 
New execution module: napalm_users
 2016-11-04 18:00:46 +13:00
Mike Place
c98f2eed8b Merge pull request #37434 from cloudflare/NAPALM-USERS-STATE 
New state module: netusers
 2016-11-04 17:20:09 +13:00
Mike Place
d5792b78f7 Merge pull request #37460 from gtmanfred/docs 
remove swig and m2crypto from hacking.rst
 2016-11-04 16:20:59 +13:00
Daniel Wallace
2b133474e5 remove swig and m2crypto from hacking.rst 2016-11-03 19:33:50 -05:00
Mircea Ulinic
8e087c9596
napalm_users doc 2016-11-03 11:23:41 +00:00
Mircea Ulinic
0590c9142f
Doc for exec mod napalm_users 2016-11-03 10:35:37 +00:00
Mike Place
107fd322a6 Merge pull request #37373 from cloudflare/NAPALM-SNMP-STATE 
Napalm snmp state
 2016-11-03 12:13:33 +13:00
Mike Place
1f5daa15a6 Merge pull request #37372 from cloudflare/NAPALM-SNMP-MODULE 
Napalm snmp execution module
 2016-11-03 12:12:04 +13:00
Mike Place
038ad04c4c Merge pull request #37376 from gtmanfred/roster 
add default roster options to the master config
 2016-11-03 12:06:23 +13:00
rallytime
c31f879f8b Merge branch '2016.3' into 'carbon' 
Conflicts:
  - salt/cloud/clouds/vmware.py
 2016-11-02 11:33:21 -06:00
Daniel Wallace
fd4df1be52 add documentation about roster_defaults 2016-11-02 09:29:03 -05:00
Mircea Ulinic
877ed8f1d5
Small typos 2016-11-02 12:01:19 +00:00
Mircea Ulinic
78cf63d0ef
Doc for the napalm snmp mod 2016-11-02 12:01:15 +00:00
Oz N Tiram
c03a184212 Make it clear that grains can exist in one place in only 2016-11-02 10:03:15 +01: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
Mike Place
d0f33ab6b2 Merge pull request #37377 from cloudflare/NAPALM-ROUTE-MODULE 
Napalm route module
 2016-11-02 19:45:52 +13:00
Mike Place
38dd7ed3ca Merge pull request #37382 from rallytime/fix-36210 
Update solarisips.list_upgrades refresh default to True
 2016-11-02 19:36:54 +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
Ethan Devenport
21e24a8125 Cloud API v3 updates including: 
* Added server availability zone parameter.
* Added volume availability zone parameters.
* Added NAT parameter for private NIC.
* Updated documentation.
 2016-11-01 21:37:53 +00:00
rallytime
e57fb947c6 Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/modules/status.py
 2016-11-01 12:56:04 -06:00
rallytime
3feb063413 Add kwarg default change to nitrogen release notes 2016-11-01 10:08:33 -06:00
Thomas S Hatch
45f365e14f Merge pull request #37357 from rallytime/update-version-refs 
Update remaining Carbon references to 2016.11.0
 2016-11-01 09:07:05 -06:00
Mircea Ulinic
13086c580b
Doc for napalm_route 2016-11-01 14:56:23 +00:00
Mircea Ulinic
626790f7da
Include doc 2016-11-01 13:40:59 +00:00
Nicole Thomas
5328bc8d99 Update man pages for 2016.11 (#37354) 2016-10-31 13:09:01 -06: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
Mike Place
a3b5109051 Merge pull request #37328 from gravyboat/bugfix/master_doc_format 
Fix up some formatting issues
 2016-10-31 18:50:15 +13:00
Benedikt Werner
b641d75235 Added suse_apache and sensehat to doc index and fixed doc formating 2016-10-30 20:41:37 +01:00
Forrest Alvarez
cf3f28c382 Fix up some formatting issues 2016-10-30 00:42:59 -07:00
rallytime
39459ed30b Document the existence of placementgroup option in ec2 driver 2016-10-28 12:51:46 -06:00
rallytime
8d3957f250 Merge branch 'carbon' into 'develop' 
Conflicts:
  - salt/cloud/clouds/vmware.py
  - salt/modules/boto_ec2.py
  - salt/modules/cmdmod.py
  - salt/modules/win_lgpo.py
 2016-10-28 11:58:41 -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
Mircea Ulinic
0ba8a2e5b9
Add NAPALM grains to docs 2016-10-27 15:50:46 +00:00
Nicole Thomas
47290d88a2 Update man pages for the 2016.3 branch (#37259) 2016-10-26 13:32:38 -06:00
rallytime
190ec32283 Merge branch 'carbon' into 'develop' 
Conflicts:
  - doc/topics/cloud/vmware.rst
  - salt/cloud/clouds/vmware.py
 2016-10-26 10:09:26 -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
70851807bd Merge branch 'carbon' into 'develop' 
Conflicts:
  - salt/modules/status.py
 2016-10-24 09:35:00 -06:00
Mike Place
d1fb992ef5 Merge pull request #37147 from kakwa/doc_safe_pillar 
add explicit reference to grains['id'] as a 'safe' grain for pillars
 2016-10-24 12:18:09 +09:00
Mike Place
d98d72fe09 Merge pull request #37156 from UtahDave/add_pr_docs 
Add pull request  docs
 2016-10-24 12:15:15 +09:00
Mike Place
4d603894d0 Merge pull request #37164 from sjorge/pdbedit 
module and state for pdbedit
 2016-10-24 12:03:48 +09:00
Eric Radman
30146115ee Update configuration examples for Joyent (#37153) 
* 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-22 07:58:46 -06:00
Super-User
5c943ddeae generate docs for pdbedit state 2016-10-22 10:14:30 +00: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
rallytime
db3150b3f1 Merge branch 'carbon' into 'develop' 
Conflicts:
  - doc/topics/installation/windows.rst
 2016-10-21 15:19:16 -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
David Boucha
b67dd076dc add pull requests doc 2016-10-21 13:26:18 -06:00
Super-User
052f069cab enable doc generation for pdbedit 2016-10-21 18:27:36 +00:00