Commit Graph

4719 Commits

Author SHA1 Message Date
Bo Maryniuk
fe97520bc7 Merge branch '2017.7' into isbm-suse-upstream-leftovers 2017-06-19 15:21:13 +02:00
Mircea Ulinic
fae959d24b Remove duplicate mattermost ref 2017-06-19 09:52:54 +00:00
Mircea Ulinic
d8dc8a338b Add redis cache reference 2017-06-19 09:52:33 +00:00
Nicole Thomas
c3a49c9552 Merge pull request #41805 from rallytime/merge-2017.7
[2017.7] Merge forward from 2016.11 to 2017.7
2017-06-16 16:01:06 -06:00
Nicole Thomas
4c9a73d75f Merge pull request #41728 from twangboy/win_install_docs
Win install docs
2017-06-16 15:41:21 -06:00
rallytime
58262608cd Merge branch '2016.11' into '2017.7'
Conflicts:
  - salt/config/__init__.py
  - salt/master.py
  - salt/modules/zypper.py
  - tests/unit/modules/timezone_test.py
2017-06-16 10:43:02 -06:00
Bo Maryniuk
e9de0746ae Fix grain for os_family on SUSE series 2017-06-16 14:39:08 +02:00
Mike Place
9c45fa044d Merge pull request #41748 from terminalmage/issue3415
Add comparison operator support for package installation in yum/dnf and apt
2017-06-15 15:32:37 -05:00
rallytime
7fef4cf38f Merge branch '2017.7' into 'develop'
Conflicts:
  - salt/engines/slack.py
2017-06-15 10:57:27 -06:00
twangboy
b6201bac33 Fix version numbers 2017-06-15 09:53:57 -06:00
Mike Place
c58f3811ce Merge pull request #41746 from rallytime/version-added-nitrogen
Update Nitrogen references to 2017.7.0
2017-06-15 10:12:18 -05:00
Mike Place
b0556bd58b Merge branch 'develop' into issue3415 2017-06-15 10:09:46 -05:00
Mike Place
e685858269 Merge pull request #41750 from rallytime/merge-2016.11
[2016.11] Merge forward from 2016.3 to 2016.11
2017-06-14 17:15:40 -05:00
Ch3LL
fa368f21ac
Add Change Log to 2016.11.6 Release Notes 2017-06-14 16:00:50 -04:00
rallytime
d7ecd3c149 Merge branch '2017.7' into 'develop'
No conflicts.
2017-06-14 13:35:50 -06:00
rallytime
89834e49c2 Merge branch '2016.3' into '2016.11'
Conflicts:
  - conf/master
  - salt/utils/schedule.py
2017-06-14 13:24:11 -06:00
Erik Johnson
f1d7eb4166 Add comparison operator feature to Oxygen release notes 2017-06-14 13:47:49 -05:00
twangboy
795a1aab4f Add instructions for Windows Firewall 2017-06-14 11:42:00 -06:00
rallytime
c5b75d030a Update Nitrogen references to 2017.7.0 in doc/* 2017-06-14 11:36:06 -06:00
twangboy
45975e299e Remove reference to Salt Enterprise 2017-06-14 09:39:29 -06:00
Mike Place
4b43ba3366 Merge pull request #41585 from cro/sign_minion_messages
Sign_minion_messages support
2017-06-13 16:14:40 -05:00
twangboy
22601201c4 Add note about salt-master on Windows 2017-06-13 15:09:38 -06:00
twangboy
d67c1dfbf7 Remove references to salt master installation 2017-06-13 15:02:44 -06:00
rallytime
74d9a36d5a Merge branch 'nitrogen' into 'develop'
Conflicts:
  - pkg/salt-proxy@.service
  - salt/modules/npm.py
  - salt/modules/parted.py
  - tests/integration/modules/test_libcloud_dns.py
2017-06-13 15:01:51 -06:00
rallytime
bdf33d7f5f Merge branch '2016.11' into 'nitrogen'
No conflicts.
2017-06-13 09:26:05 -06:00
rallytime
5150916556 Merge branch '2016.3' into '2016.11'
Conflicts:
  - salt/modules/parted.py
2017-06-12 20:10:45 -06:00
Erik Johnson
6ec9dfb7f3 Update version in master-tops docs
This paragraphs is referring to #37322, which was pushed to Oxygen.
2017-06-12 17:20:09 -05:00
rallytime
c91ca5f809 Remove note about version incompatibility with salt-cloud
The note references very old versions of salt + salt-cloud and since
salt-cloud has been incorporated into salt for quite some time, this
notice is no longer needed.
2017-06-12 11:16:52 -06:00
C. R. Oldham
dadf4b851c Add documentation to the example master and minion configuration files.
Move minion event signing to a saner place.
Enable dropping messages when signature does not verify or when
minion is not adding the signature to its payloads.
2017-06-08 13:18:53 -06:00
Vasili Syrakis
4fbcc3b318 Added documentation for the annotation 2017-06-09 00:25:10 +10:00
Arno schuring
85f520467a
Update modules doc
Reword the description of the __virtual__() function, to clarify why
__salt__ should not be relied upon. In response to #41628
2017-06-08 13:45:14 +02:00
Mike Place
b7fcf9c0da Merge pull request #41636 from rallytime/merge-develop
[develop] Merge forward from nitrogen to develop
2017-06-07 12:42:04 -05:00
rallytime
396b06fdf8 Merge branch 'nitrogen' into 'develop'
No conflicts.
2017-06-07 09:54:20 -06:00
rajvidhimar
0fd3344a65 Update network_automation doc 2017-06-07 14:04:58 +05:30
Mike Place
94aa1876d4 Merge pull request #41546 from cloudflare/dns-grains
Add host_dns grain for napalm
2017-06-06 15:00:07 -05:00
Mircea Ulinic
564f2d1e3d Indent correctly the code block 2017-06-06 15:23:14 +00:00
Mircea Ulinic
b70df6e576 Reference new Jinja filters in the release notes 2017-06-06 15:15:06 +00:00
Mircea Ulinic
406e582479 Small adjustment 2017-06-06 15:14:47 +00:00
Mircea Ulinic
62cb2a1c7a More jinja references 2017-06-06 15:05:50 +00:00
Mircea Ulinic
bba8c27873 Restructure the Jinja topic to have refrences 2017-06-06 14:56:21 +00:00
Mircea Ulinic
2a8c5cef04 Add notes regarding other new features 2017-06-06 14:18:01 +00:00
Mircea Ulinic
b59760fae2 Fix indentation for better display 2017-06-06 13:52:01 +00:00
Mircea Ulinic
ad4e6e5ec5 salt.beacons.log instead of 'Log' 2017-06-06 13:46:38 +00:00
Mircea Ulinic
36985bb1ed Remove service state, not a new one 2017-06-06 13:45:02 +00:00
Mircea Ulinic
b6b6a51846 Index new modules introduced in Nitrogen 2017-06-06 13:41:32 +00:00
Mircea Ulinic
6b1b05129c Remove the reference to the profile outputter 2017-06-06 12:49:04 +00:00
rajvidhimar
e92b110a1c Junos specific documentation for topic Network Automation 2017-06-05 16:03:30 +05:30
Ric Klaren
aa88749a71 Add flag to disable validation when cloning a libvirt domain
Provide workaround for issue #41137
2017-06-01 23:14:15 +02:00
Mircea Ulinic
fb12353a1d Insert note in the Nitrogen release 2017-06-01 11:42:53 +00:00
rallytime
8c1dc36a8b Merge branch 'nitrogen' into 'develop'
Conflicts:
  - salt/modules/zypper.py
  - salt/utils/parsers.py
2017-05-30 10:20:44 -06:00
Mike Place
cec5af7ce3 Merge pull request #41437 from Ch3LL/fix_gce_net
Remove ex_subnetwork requirement for GCE
2017-05-26 17:04:06 -05:00
rallytime
ff417db115 Merge branch 'nitrogen' into 'develop'
Conflicts:
  - doc/topics/venafi/index.rst
  - pkg/salt-proxy@.service
  - salt/config/__init__.py
2017-05-26 11:27:24 -06:00
Nicole Thomas
5bb9dac9ec Merge pull request #41413 from gtmanfred/nitrogen
Write tests for Venafi runner
2017-05-26 10:09:23 -06:00
Ch3LL
3f94964801
Remove ex_subnetwork requirement for GCE 2017-05-25 16:25:12 -04:00
Daniel Wallace
6dfb63f15d add venafi to table of contents 2017-05-25 10:27:40 -06:00
Daniel Wallace
343a0b206c fix doc 2017-05-25 10:26:54 -06:00
wgoulet
44dec966c8 Updated documentation for Venafi module with better examples & clarifications 2017-05-25 10:26:54 -06:00
rallytime
9ff2694155 Merge branch '2016.11' into 'nitrogen'
Conflicts:
  - pkg/salt-minion.service
  - salt/modules/junos.py
  - salt/modules/localemod.py
  - salt/modules/win_system.py
  - salt/states/junos.py
  - tests/unit/modules/test_localemod.py
  - tests/unit/modules/test_win_powercfg.py
  - tests/unit/states/dockerng_test.py
2017-05-24 16:32:59 -06:00
Benjamin Drung
33a7f8b2ec Fix typos
lintian found several spelling errors.

Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>
2017-05-24 12:50:29 +02:00
Ch3LL
0d3f5da0ec add spaces for code in docs 2017-05-23 11:35:20 -06:00
Ch3LL
42e614bb7d add title 2017-05-23 11:35:20 -06:00
Ch3LL
b02ec97cff add ability to expand disk size on creation of vm in nebula 2017-05-23 11:35:20 -06:00
rallytime
718b0adc70 Merge branch 'nitrogen' into 'develop'
Conflicts:
  - salt/modules/zypper.py
  - tests/unit/utils/test_network.py
2017-05-23 09:05:13 -06:00
Mike Place
337d00fbf9 Merge pull request #41352 from whiteinge/rest_cherrypy-cors-token
rest_cherrypy CORS fix & /token endpoint
2017-05-22 11:03:04 -05:00
Mike Place
8b45b577a9 Merge pull request #41356 from whiteinge/doc-full_return
Add full_return to release notes
2017-05-22 10:56:14 -05:00
Seth House
fa0b1e7d7e Add full_return to release notes 2017-05-21 16:27:40 -06:00
rallytime
c6c1d30c48 Merge branch '2016.11' into 'nitrogen'
Conflicts:
  - salt/modules/yumpkg.py
  - salt/spm/__init__.py
  - tests/unit/modules/test_zypper.py
  - tests/unit/utils/test_network.py
2017-05-20 17:07:34 -06:00
Seth House
f6ae3b4634 Add rest_cherrypy additions to the release notes 2017-05-20 15:59:46 -06:00
Mike Place
6bdb7cca7d Merge pull request #41327 from Ch3LL/add_2016.11.6_release
Add 2016.11.6 Release Notes
2017-05-19 13:05:08 -05:00
Ch3LL
e5fc0aeb9c
Add 2016.11.6 Release Notes 2017-05-18 14:17:35 -04:00
Ch3LL
9a1bf4205f
fix url refs in rst 2017-05-18 12:42:35 -04:00
Ch3LL
cde008ff77
Add patched packages warning to 2016.11.5 release notes 2017-05-18 12:24:53 -04:00
Mike Place
8386d10b4b Merge pull request #41192 from DSRCorporation/features/executors_redesign_doc
Executors redesign and documentation
2017-05-18 10:42:20 -05:00
Mike Place
1c3741eae1 Merge pull request #41284 from shengis/azurerm_load_balancers
Add support for load balancers with AzureARM provider
2017-05-17 13:24:58 -05:00
Aurélien FUSIL-DELAHAYE
f7252151a1 Add support for availibility_set
documentation added
2017-05-17 11:50:31 +02:00
Aurelien Fusil-Delahaye
495e848dad Documentation for load-balancer 2017-05-16 23:22:40 +02:00
Dmitry Kuzmenko
7a8b644da7 Executors documentation. 2017-05-15 11:41:00 +03:00
Evgeny Akhmetkhanov
76104f23b4 Add basic auth for SPM 2017-05-14 15:32:55 +03:00
rallytime
d75a7e0d0f Merge branch 'nitrogen' into 'develop'
No conflicts.
2017-05-12 16:42:54 -06:00
Mike Place
8028b9f00f Merge pull request #41182 from amendlik/win-authtest
Saltify credendial verification for Windows
2017-05-12 12:05:07 -05:00
Mike Place
a0a2646007 Merge pull request #41194 from rallytime/md5-warning-cleanup
Update fingerprint hash type default from md5 to sha256
2017-05-12 11:13:18 -05:00
Mike Place
8dab7390e6 Merge pull request #41201 from rallytime/remove-blockdev-module
Remove blockdev execution module
2017-05-12 11:09:21 -05:00
rallytime
d510583bb5 Remove blockdev execution module
All of the functions in the blockdev execution module have been
moved over to the disk execution module. These functions were
slated for removal in the Oxygen release.
2017-05-11 14:13:42 -06:00
rallytime
e1bd7ce10a Merge branch 'nitrogen' into 'develop'
No conflicts.
2017-05-11 13:03:59 -06:00
Nicole Thomas
5cfaa908aa Bump code block example in 4 spaces
This allows the code-block to be rendered correctly when the docs build.
2017-05-11 10:28:10 -06:00
rallytime
bb0f8f32de Update fingerprint hash type default from md5 to sha256
This PR also removes the warnings that this default with change in
the Nitrogen release, updates the documetation accordingly, and adjusts
some of the affected tests.
2017-05-11 09:33:45 -06:00
Peter C. Norton
3b50059992 Change docs to match what I see in the code 2017-05-10 19:13:08 -04:00
rallytime
4100e2b6a6 Merge branch 'nitrogen' into 'develop'
No conflicts.
2017-05-10 15:32:33 -06:00
rallytime
12a75c1108 Merge branch '2016.11' into 'nitrogen'
No conflicts.
2017-05-10 15:32:23 -06:00
Nicole Thomas
ac5bda8839 Merge pull request #41117 from terminalmage/rename_env_blacklist_whitelist
Rename the *_env_blacklist config opts to *_saltenv_blacklist
2017-05-10 14:03:23 -06:00
twangboy
24b11ffdc2 Add release notes 2017-05-10 12:27:45 -06:00
Adam Mendlik
a0d08ed13f Allow saltify cloud provider to verify Windows credentials 2017-05-10 11:58:55 -06:00
Ch3LL
28371aa035
2016.11.5 release notes: add additional commits 2017-05-09 17:02:51 -04:00
rallytime
ef0df4a954 Merge branch '2016.11' into 'nitrogen'
Conflicts:
  - salt/modules/win_network.py
  - salt/modules/win_pkg.py
  - salt/utils/gitfs.py
  - tests/unit/modules/test_win_network.py
  - tests/unit/states/test_file.py
2017-05-09 14:32:49 -06:00
Nicole Thomas
d2ae7deff2 Merge pull request #41148 from rallytime/merge-2016.11
[2016.11] Merge forward from 2016.3 to 2016.11
2017-05-09 14:23:28 -06:00
Mike Place
6fa41dc89d Merge pull request #41111 from terminalmage/issue41105
Allow "ssl_verify: False" to work with pygit2
2017-05-09 11:56:11 -06:00
rallytime
4c099df8fa Merge branch 'nitrogen' into 'develop'
No conflicts.
2017-05-09 11:27:55 -06:00
rallytime
aba35e20dd Merge branch '2016.3' into '2016.11'
No conflicts.
2017-05-09 11:14:05 -06:00
Daniel Wallace
2370d9316b add user_data to digital ocean 2017-05-08 09:59:27 -06:00
Erik Johnson
f6a16956a0 Add note on lack of support for VSTS in older libssh2 releases. 2017-05-08 07:59:53 -05:00
Erik Johnson
59737a34a5 Rename the *_env_blacklist config opts to *_saltenv_blacklist
These were overlooked a while back when we deprecated env in favor of
saltenv.
2017-05-06 23:11:33 -05:00
Erik Johnson
8c6410e3cd Add notices about ssl_verify only working in 0.23.2 and newer 2017-05-05 17:04:23 -05:00
Erik Johnson
f73c4b7167 Add http(s) auth config docs for GitPython 2017-05-05 16:56:01 -05:00
SaltyCharles
d27e37e3d9 update aws.rst for usage clarification
`del_tags` requires `tags=`.
2017-05-05 13:08:40 -07:00
rallytime
01a012bbdf Merge branch 'nitrogen' into 'develop'
No conflicts.
2017-05-05 10:12:18 -06:00
rallytime
bb1917243e Merge branch '2016.11' into 'nitrogen'
No conflicts.
2017-05-05 10:11:11 -06:00
Mike Place
7efa7530f3 Merge pull request #41073 from tshepang/patch-1
doc: make examples consistent with each other
2017-05-05 10:06:34 -06:00
Ch3LL
96ed815687
Add 2016.11.5 release notes and change log 2017-05-04 14:16:18 -04:00
rallytime
319dc45c1d Merge branch 'nitrogen' into 'develop'
Conflicts:
  - salt/runners/saltutil.py
2017-05-04 11:51:32 -06:00
rallytime
c91bb18298 Merge branch '2016.11' into 'nitrogen'
Conflicts:
  - doc/ref/configuration/master.rst
  - salt/modules/pip.py
  - salt/states/saltmod.py
2017-05-04 11:49:33 -06:00
Tshepang Lekhonkhobe
a29045846d doc: make examples consistent with each other
Also, show a more complex example, which makes removing the templating necessary
2017-05-04 19:04:20 +02:00
Mircea Ulinic
e3c40ea81a Outputters txt ref 2017-05-04 09:33:45 -06:00
Mircea Ulinic
20b307a310 Add New Modules section 2017-05-04 09:33:45 -06:00
Mircea Ulinic
7c8f14977b More NAPALM notes 2017-05-04 09:33:45 -06:00
Mircea Ulinic
ce55d85c96 Double 'that' 2017-05-04 09:17:17 +00:00
Mircea Ulinic
727d220942 More salt-minion on ntwrk gear notes 2017-05-04 09:09:08 +00:00
Mircea Ulinic
9317a4595c One more phrase at the end... 2017-05-04 09:09:08 +00:00
Mircea Ulinic
5e99a1737c Start working on network automation docs 2017-05-04 09:09:03 +00:00
Nicole Thomas
c13f0dc2a8 Revert "Updated ssh fingerprint hash-type default to sah256 for Nitrogen and remove md5 warnings" 2017-05-03 16:49:39 -06:00
Nicole Thomas
2b47b7bec6 Merge pull request #41045 from terminalmage/clarify-gitfs-docs
Clarify gitfs docs
2017-05-03 16:24:54 -06:00
Erik Johnson
c757eda331 Clarify gitfs docs
This improves cross links to the per-remote docs from the master config
file documentation.
2017-05-03 13:34:56 -05:00
Erik Johnson
ebae1d8fe9 Merge pull request #40985 from ekristen/feature/remote-as-formula
[Feature] Turns a gitfs remote into a true "formula", merges specified branch into current saltenv
2017-05-03 12:17:17 -05:00
Mike Place
a1f83ebb1e Merge pull request #41033 from rallytime/merge-nitrogen
[nitrogen] Merge forward from 2016.11 to nitrogen
2017-05-03 11:13:42 -06:00
Mike Place
3626258f50 Merge pull request #40899 from rallytime/remove-md5-warning
Updated ssh fingerprint hash-type default to sah256 for Nitrogen and remove md5 warnings
2017-05-03 10:55:26 -06:00
rallytime
19a3ecd5b8 Merge branch '2016.11' into 'nitrogen'
No conflicts.
2017-05-03 09:59:09 -06:00
Mircea Ulinic
a69e88055d Outputters txt ref 2017-05-03 15:13:05 +01:00
Mircea Ulinic
225014c3fb Add New Modules section 2017-05-03 11:50:28 +00:00
Mircea Ulinic
6c44452c90 More NAPALM notes 2017-05-03 11:37:40 +00:00
Erik Johnson
d6cd5056cf Enhance the Global Remotes docs 2017-05-02 16:37:56 -05:00
Erik Johnson
f73050fd0f mention all_saltenvs and link back to gitfs walkthrough 2017-05-02 16:37:47 -05:00
rallytime
fc756c595c Merge branch '2016.3' into '2016.11'
Conflicts:
  - doc/ref/configuration/master.rst
  - salt/config/__init__.py
2017-05-02 12:52:59 -06:00
Nicole Thomas
1c0c53bcd0 Merge pull request #41006 from rallytime/merge-develop
[develop] Merge forward from nitrogen to develop
2017-05-02 12:49:23 -06:00
Mike Place
19894f68ca Merge pull request #40724 from cro/minion_key_revoke_cfg
Minion key revoke cfg
2017-05-02 11:18:05 -06:00
Mike Place
cc71347a7c Merge pull request #40973 from tonybaloney/libcloud_compute
Introduce `libcloud_compute` execution module for Libcloud compute APIs
2017-05-02 10:03:42 -06:00
rallytime
ecb962cdee Merge branch 'nitrogen' into 'develop'
Conflicts:
  - salt/runners/saltutil.py
2017-05-02 09:00:22 -06:00
Erik Johnson
74ef0bf1d7 Clarify that it is only all_saltenvs which is new in Oxygen
Depending on how you read it, the previous version may have suggested
that all of the per-remote parameters are new in Oxygen. This makes it
more explicit that the all_saltenvs param is the only one new to Oxygen.
2017-05-02 09:10:21 -05:00
Mike Place
42967eab99 Merge pull request #40893 from tonybaloney/libcloud_state
Improvements to libcloud modules
2017-05-01 13:58:25 -06:00
rallytime
8e4b679d5c Merge branch '2016.11' into 'nitrogen'
Conflicts:
  - salt/modules/pip.py
2017-05-01 10:45:19 -06:00
rallytime
a9fb83c28c Merge branch 'nitrogen' into 'develop'
No conflicts.
2017-05-01 10:43:45 -06:00
Erik Kristensen
fa1e56ad14 rename to all_saltenvs, add initial documentation 2017-05-01 08:56:18 -06:00
Anthony Shaw
4fce227190
update the tutorials and docs 2017-04-30 20:32:44 +10:00
Anthony Shaw
e92a7ba660 Merge branch 'develop' into libcloud_state 2017-04-29 07:43:28 +10:00
rallytime
a69cd74f75 Merge branch '2016.11' into 'nitrogen'
Conflicts:
  - salt/cloud/clouds/nova.py
  - salt/spm/__init__.py
2017-04-28 09:23:42 -06:00
rallytime
7f31e41aa6 Merge branch '2016.3' into '2016.11'
Conflicts:
  - salt/modules/pip.py
2017-04-28 09:20:59 -06:00
Mike Place
8fdfe4ece6 Merge pull request #40935 from gtmanfred/softlayer
Attempt to connect to public ip address in softlayer
2017-04-28 05:43:57 -06:00
Anthony Shaw
11907ae3b2 Update libcloud.rst 2017-04-28 19:01:21 +10:00
Erik Johnson
e494ae43e5 Add dockerng fixes to 2016.11.4 release notes 2017-04-27 14:07:29 -05:00
Daniel Wallace
d6eb11410f Attempt to connect to public ip address in softlayer
Unless private_ssh or private_wds is set.

Softlayer does not require that a public_vlan be set in order to build a server
with a public ip address.  It can also be cumbersome to keep track of multiple
public_vlans which can be configured at the account level if you have multiple
accounts.

Like other cloud providers softlayer should default to connecting to the
public_vlan unless private_ssh is set to True.
2017-04-27 12:22:13 -06:00
rallytime
a876bcdb8a Merge branch 'nitrogen' into 'develop'
No conflicts.
2017-04-27 10:37:05 -06:00
Erik Johnson
8c078f144c Add additional note about quoting within load_yaml 2017-04-27 11:13:01 -05:00
Erik Johnson
123b5cdc11 Add documentation for PyYAML's loading of time expressions
Also remove the notice about the handling of integer scalars starting
with zeroes, as this was fixed in 0.10.0 which is roughly 5 years old
now.
2017-04-27 10:59:49 -05:00
Super-User
db6eadd6c3 update oxygen release notes for grains deprecation 2017-04-26 23:30:53 +02:00
Anthony Shaw
e2dc7bf141
format rst in tutorial 2017-04-27 06:32:25 +10:00
Mike Place
7a63e3cfd2 Merge pull request #40668 from grep4linux/new_xen_cloud_driver
new Xen cloud driver
2017-04-26 10:59:38 -06:00
rallytime
e2aa5e2f21 Add fingerprint_hash_type default value change to release notes 2017-04-26 10:47:28 -06:00
Anthony Shaw
f983d7e07b
enable load balancer to support extended arguments in create and destroy balancer 2017-04-26 21:10:43 +10:00
Anthony Shaw
e384754cb3
tutorial for the libcloud modules 2017-04-26 15:09:08 +10:00
Nicole Thomas
7c10a419a1 Merge pull request #40866 from rallytime/merge-nitrogen
[nitrogen] Merge forward from 2016.11 to nitrogen
2017-04-25 16:42:11 -06:00
rallytime
d7831c451c Merge branch 'nitrogen' into 'develop'
No conflicts.
2017-04-25 11:09:01 -06:00
Mike Place
5d9dd3ad56 Merge pull request #40805 from terminalmage/moby
Alias moby to docker in Nitrogen (and later)
2017-04-24 22:37:53 -06:00
rallytime
5372f25fde Merge branch '2016.11' into 'nitrogen'
Conflicts:
  - salt/cloud/clouds/rackspace.py
  - tests/unit/cloud/clouds/test_dimensiondata.py
2017-04-24 15:35:28 -06:00
Erik Johnson
0e229a1910 Add note about moby naming to Nitrogen release notes 2017-04-23 23:34:58 -05:00
Mike Place
b5179aa873 Merge pull request #40778 from rallytime/oxygen-deprecations
Start removing deprecated code for Oxygen release
2017-04-23 04:30:51 -06:00
Ch3LL
704048be30
add spaces for code in docs 2017-04-21 16:10:31 -04:00
Ch3LL
09f7b3a500
add title 2017-04-21 16:08:52 -04:00
Ch3LL
f0ff969c6a
add ability to expand disk size on creation of vm in nebula 2017-04-21 16:05:18 -04:00
Daniel Wallace
559aa1d8b6 remove deprecated firstgen rackspace cloud driver 2017-04-21 08:59:56 -06:00
rallytime
55c947adf4 Merge branch 'nitrogen' into 'develop'
No conflicts.
2017-04-20 13:44:37 -06:00
rallytime
0b96d52f71 Merge branch '2016.11' into 'nitrogen'
Conflicts:
  - salt/modules/win_pkg.py
2017-04-20 11:21:10 -06:00
Mike Place
5388ffa7a2 Merge pull request #40785 from alexproca/backport-winexec-selection
win_pkg: backport 2016.11 add msiexec override to enable selection of 32 or 64 msiexec.exe
2017-04-20 10:45:13 -06:00
Erik Johnson
f99259a6eb Fix inaccurate nodegroup docs
We should probably support defining nodegroups as a "dictlist" in the
future, but we don't right now, so the docs are currently inaccurate.
2017-04-20 10:07:19 -05:00
Alex Proca
91cafd5094 Add option to select 32 or 64 version of msiexec
Pass path to msiexec overloading msiexec parameter
2017-04-20 12:25:52 +03:00
rallytime
e9f1d998cb Remove support for various deprecated state functions and kwargs
- salt/states/archive.py
- salt/states/cmd.py
- salt/states/file.py
- All changes were documented in the oxygen release notes
2017-04-19 14:35:04 -06:00
rallytime
59398f658e Remove support for deprecated win_* execution modules
- Removed win_psget.psversion function
- Removed win_service.config function
- Removed support for various kwargs in the win_service.create function
- Updated Oxygen release notes with all changes
2017-04-19 14:35:04 -06:00
rallytime
d9986185cf Remove support for deprecated "requests_lib" option
Use "backend" instead.
2017-04-19 14:35:04 -06:00
rallytime
0616405104 Merge branch 'nitrogen' into 'develop'
No conflicts.
2017-04-18 16:43:11 -06:00
C. R. Oldham
d24078d1a0 Add docs for "datastore" param for disks 2017-04-18 09:33:46 -06:00
C. R. Oldham
500d6b281d Document validity of a datastore key inside a disk definition. 2017-04-18 09:33:46 -06:00
rallytime
292f55600b Merge branch '2016.11' into 'nitrogen'
Conflicts:
  - salt/fileserver/s3fs.py
  - tests/unit/test_fileclient.py
2017-04-17 13:32:56 -06:00
C. R. Oldham
65ea8997b7 Add allow_minion_key_revoke config option 2017-04-17 13:20:45 -06:00
Ch3LL
d228fb6e02
Add 2016.11.4 Release Note ChangeLog 2017-04-14 17:17:03 -04:00
rallytime
5282ea2480 Merge branch 'nitrogen' into 'develop'
No conflicts.
2017-04-13 09:46:05 -06:00
Raine Curtis
87035e0651 new Xen cloud driver 2017-04-12 14:52:07 -06:00
Mike Place
4af8d08e43 Merge pull request #40581 from terminalmage/release_notes
Make scheduled change to osmajorrrelease grain, clean up Nitrogen release notes
2017-04-11 16:49:15 -06:00
Erik Johnson
6cf9202bc8 Fix more formatting issues in nitrogen release notes
The wildcard versions docs should be grouped under the same top-level
bullet. Also, there was a stray execution module change that seems to
have tried to flee south. I have returned it to it's natural habitat.
2017-04-11 11:02:58 -05:00
Erik Johnson
c36c9465e6 Formatting fixes for the module.run changes
This fixes the RST formatting so that it renders properly in the
bulleted list format. It also makes some changes to the wording for
clarification purposes.
2017-04-11 11:02:58 -05:00
Erik Johnson
3bbebd7d82 os_release -> osmajorrelease
This is a typo fix
2017-04-11 11:02:58 -05:00
Mike Place
b2870cd4c2 Merge pull request #40613 from Venafi/develop
Updated documentation for Venafi module with better examples & clarif…
2017-04-11 08:48:35 -06:00
Mike Place
4d24fc2666 Merge pull request #40617 from rallytime/oxygen-release-notes
Start release notes file for Oxygen
2017-04-11 08:47:39 -06:00
rallytime
5acaee2d5d Start release notes for Oxygen 2017-04-10 16:44:58 -06:00
Mike Place
c56247c105 Merge pull request #40608 from pcn/patch-1
Fix confusing typo in thorium start page
2017-04-10 16:24:48 -06:00
wgoulet
bbac469cdb Updated documentation for Venafi module with better examples & clarifications 2017-04-10 15:41:24 -05:00
rallytime
2cd0c5e4ec Merge branch '2016.11' into 'nitrogen'
Conflicts:
  - doc/topics/cloud/azurearm.rst
  - salt/cloud/clouds/vultrpy.py
  - salt/modules/aptpkg.py
  - salt/modules/dockermod.py
  - tests/unit/modules/dockerng_test.py
  - tests/unit/modules/test_pillar.py
2017-04-10 14:09:25 -06:00
Nicole Thomas
93818257cb Merge pull request #40591 from rallytime/merge-nitrogen
[nitrogen] Merge forward from 2016.11 to nitrogen
2017-04-10 12:07:16 -06:00
Peter N
df9b061a33 Fix confusing typo in thorium start page
The thorium auto deregistration example has a slightly confusing typo.  From my read of the docs it should `s/startreg/statreg` so I'm submitting this PR to make that effective.
2017-04-10 10:54:26 -04:00
rallytime
4a75675d07 Merge branch '2016.11' into 'nitrogen'
Conflicts:
  - doc/topics/cloud/azurearm.rst
  - salt/modules/aptpkg.py
  - salt/modules/dockermod.py
  - tests/unit/modules/dockerng_test.py
2017-04-07 11:20:51 -06:00
Mike Place
fa2c8f852a Merge pull request #40557 from isbm/isbm-aws-doc-fix
Fix the documentation for AWS
2017-04-06 12:25:54 -06:00
Joseph Hall
08d071bc68 Update Azure ARM docs 2017-04-06 09:43:19 -06:00
Bo Maryniuk
99b7996ce6 Fix the documentation for AWS 2017-04-06 15:02:17 +02:00
Nicole Thomas
4d7871e4d7 Merge pull request #40494 from rallytime/merge-develop
[develop] Merge forward from 2016.11 to develop
2017-04-05 14:15:05 -06:00