valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-06 16:45:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
100,857 Commits 24 Branches 182 Tags 341 MiB
f848aa474d
Commit Graph

5655 Commits

Author SHA1 Message Date
Nicole Thomas
f7c2f04574
Merge pull request #50182 from terminalmage/issue50050 
Backport runtests.py modifications from develop to 2018.3
 2018-10-29 12:25:06 -04:00
rallytime
8fed338708
Merge branch '2018.3' into 'fluorine' 
Conflicts:
  - salt/spm/pkgfiles/local.py
  - salt/utils/schedule.py
  - tests/integration/scheduler/test_eval.py
 2018-10-25 10:31:06 -04:00
rallytime
897145c4a1
Merge branch '2017.7' into '2018.3' 
No conflicts.
 2018-10-24 15:54:15 -04:00
Ch3LL
896caa120f
Add 2016.11.10 release notes to 2018.3 branch 2018-10-24 11:08:38 -04:00
Ch3LL
1e3415860f
[2018.3.3] remove in progress and add security details 2018-10-24 10:31:16 -04:00
Ch3LL
71ee68b6f1
[2017.7.8] remove in progress and add security details 2018-10-24 10:27:39 -04:00
Erik Johnson
5ea1024b5d
Add documentation explaining naming convention for test files 2018-10-23 14:51:28 -05:00
Max Arnold
881a521586 Revert curly braces example for nested dictionaries 2018-10-23 23:25:08 +07:00
rallytime
b9f61323b5
Merge branch '2018.3' into 'fluorine' 
No conflicts.
 2018-10-22 14:41:20 -04:00
Nicole Thomas
aa66d1b7ba
Merge pull request #50158 from vutny/doc/2017.7/fix-http-tutorial 
[DOC] Fix JSON payload example in HTTP tutorial
 2018-10-22 14:37:51 -04:00
Denys Havrysh
fe2d70d4a3
[DOC] Fix JSON payload example in HTTP tutorial 2018-10-22 18:57:04 +03:00
Michael Lustfield
3a62f74758
Add support for setting root ssh pubkey to proxmox containers. 2018-10-20 19:03:40 -05:00
Mike Place
bfce09c2fe
Merge pull request #49937 from ssc-services/fix-virt-what-multiline-results 
Fix value of `virtual` grain when using `virt-what`
 2018-10-19 07:27:42 -06:00
Elias Probst
08b1b17465
Add release notes for virtual grain fix 2018-10-19 01:03:25 +02:00
rallytime
82e73fe49d
Merge branch '2018.3' into 'fluorine' 
Conflicts:
  - doc/ref/tops/all/index.rst
  - salt/fileclient.py
  - salt/grains/core.py
  - salt/modules/win_file.py
  - salt/pillar/__init__.py
  - salt/utils/http.py
 2018-10-18 10:41:42 -04:00
Mike Place
b94e0a01ac
Merge pull request #50055 from rallytime/bp-50024 
Back-port #50024 to 2018.3
 2018-10-16 11:14:06 +02:00
rallytime
1b5b018da2
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - salt/minion.py
  - salt/states/lvm.py
 2018-10-15 13:13:57 -04:00
rwaweber
1ea72a00aa
docs: Correct spelling mistake and smooth out sentence 2018-10-15 12:58:28 -04:00
rallytime
e3a0f7b6f2
Add gce fix to 2017.7.9 release notes 2018-10-15 11:03:06 -04:00
Joachim Gleissner
e6d86fca91
document GCE instance credentials configuration 2018-10-15 11:02:25 -04:00
rallytime
f8e73e8ae2
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - salt/beacons/inotify.py
 2018-10-10 15:13:23 -04:00
rallytime
32e7d90384
Add 2018.3.4 release notes file 2018-10-10 10:14:29 -04:00
rallytime
6c00003fd8
Add 2017.7.9 release notes file 2018-10-10 10:12:26 -04:00
rallytime
46c0e50638
Merge branch '2018.3' into 'fluorine' 
Conflicts:
  - doc/man/salt.7
 2018-10-03 09:45:20 -04:00
Erik Johnson
108c026e1d
Fix additional references to Fluorine in matcher docs 2018-10-02 11:53:13 -05:00
C. R. Oldham
853740d00b
Change versionadded to Neon 2018-10-02 11:49:40 -05:00
rallytime
81b0aa7099
Add "in progress" notation back to the 2018.3.3 release notes 
This has been removed in the 2018.3.3 branch for release prep, but the docs
on the main website still need to say this is in progress until we release.
 2018-10-01 09:17:50 -04:00
rallytime
0e761036f1
Merge branch '2018.3.3' into '2018.3' 
No conflicts.
 2018-09-30 12:39:44 -04:00
Nicole Thomas
1db2d2e4d0
Merge pull request #48809 from cro/matcher_in_loader2 
Matcher in loader, take 4
 2018-09-26 09:22:39 -04:00
rallytime
7e0db5cb15
Merge branch '2018.3' into 'fluorine' 
Conflicts:
  - salt/cloud/clouds/azurearm.py
 2018-09-25 15:18:00 -04:00
Ch3LL
3043b0890f
Remove In Progress note for 2018.3.3 release 2018-09-21 16:28:49 -04:00
Ch3LL
aef85d3b3f
Add Changelog for 2018.3.3 2018-09-21 14:22:04 -04:00
C. R. Oldham
85ac68b62c
Clarify doc 2018-09-21 09:36:02 -06:00
C. R. Oldham
2495d48f49
Add docs for loadable matchers. 2018-09-21 09:35:52 -06:00
Erik Johnson
8393560642
Add warning about using jinja filters to dump dicts in Jinja 2018-09-20 14:56:26 -05:00
rallytime
9298304ce9
Merge branch '2018.3' into 'fluorine' 
No conflicts.
 2018-09-19 14:07:06 -04:00
rallytime
b39dacf06c
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - salt/pillar/cmd_yamlex.py
 2018-09-18 10:08:16 -04:00
Erik Johnson
7e5bab78c5
Fix docs build errors (2017.7 branch) 2018-09-17 22:35:08 -06:00
rallytime
c274635933
Fix some doc build warnings 2018-09-17 16:20:05 -04:00
rallytime
49afc328b5
Merge branch '2018.3' into 'fluorine' 
Conflicts:
  - .github/CODEOWNERS
 2018-09-07 16:21:13 -04:00
rallytime
cf508a4a50
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - requirements/opt.txt
  - requirements/tests.txt
  - salt/modules/win_service.py
  - tests/integration/states/test_service.py
 2018-09-06 12:08:01 -04:00
rallytime
862c44c036
Merge branch '2018.3' into 'fluorine' 
No conflicts.
 2018-09-05 09:41:04 -04:00
rallytime
de7ef3d681
Add "in progess" notation back to 2017.7.8 release notes 
We need this notation in the branch for now. We will remove it once the release
is live.
 2018-09-05 09:39:14 -04:00
rallytime
edad2dcda9
Merge branch '2017.7.8' into '2017.7' 
No conflicts.
 2018-09-05 09:36:33 -04:00
Ch3LL
d40b6444a1
Update 2017.7.8 ChangeLog with new fixes 2018-09-04 17:28:50 -04:00
rallytime
2317b5ef58
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - salt/client/ssh/__init__.py
  - tests/integration/modules/test_win_ntp.py
 2018-09-04 12:01:38 -04:00
rallytime
d1e51db8d3
Remove references to unused milestones in docs 2018-08-30 15:12:34 -04:00
Erik Johnson
d69e3e1a27
Add separate deserializer_opts argument to file.serialize 
The functions to load and dump data don't have the same arguments, so
it's not a good idea to pass the same kwargs to both and then capture
the inevitable traceback that will be the result. Instead, this adds a
separate `deserializer_opts` argument which will be used only in the
case where `merge_if_exists` is set to `True`.
 2018-08-24 18:12:05 -05:00
Ch3LL
f6b70bb653
Add changelog to 2017.7.8 release notes 2018-08-14 10:11:45 -04:00
rallytime
5ff1ddb0dd
Merge branch '2018.3' into 'fluorine' 
Conflicts:
  - salt/modules/cmdmod.py
  - salt/utils/schedule.py
  - tests/integration/files/conf/master
  - tests/integration/netapi/rest_tornado/test_app.py
  - tests/integration/runners/test_state.py
  - tests/integration/scheduler/test_eval.py
 2018-08-10 14:18:34 -04:00
Nicole Thomas
d7b7a92ef6
Merge pull request #49011 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-08-09 13:34:17 -04:00
Mircea Ulinic
29b84bb047 More small corrections 2018-08-08 21:43:11 +01:00
rallytime
3e6445a9d6
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - doc/man/salt-api.1
  - doc/man/salt-call.1
  - doc/man/salt-cloud.1
  - doc/man/salt-cp.1
  - doc/man/salt-key.1
  - doc/man/salt-master.1
  - doc/man/salt-minion.1
  - doc/man/salt-proxy.1
  - doc/man/salt-run.1
  - doc/man/salt-ssh.1
  - doc/man/salt-syndic.1
  - doc/man/salt-unity.1
  - doc/man/salt.1
  - doc/man/salt.7
  - doc/man/spm.1
  - salt/beacons/log.py
  - salt/client/ssh/__init__.py
  - salt/modules/cmdmod.py
  - salt/utils/win_functions.py
  - tests/integration/modules/test_cmdmod.py
  - tests/integration/netapi/rest_tornado/test_app.py
  - tests/integration/runners/test_state.py
 2018-08-08 13:31:57 -04:00
Mircea Ulinic
a7410c9db1 Small corrections 2018-08-08 16:22:09 +01:00
Mircea Ulinic
0aebde0df3 Add NetBox and PeeringDB, as well as list all the new modules 2018-08-08 16:07:47 +01:00
Mircea Ulinic
69466182b5 Document the new network automation features 2018-08-08 15:35:05 +01:00
Ch3LL
757daf7d7e
add runas macosx warning in 2018.3.3 release notes 2018-08-07 15:49:26 -04:00
Luke Overend
969d7d68fc
Add new google_chat module 
To send a message directly to google chat via the api (not via a bot)
you need to configure a webhook and post directly to that webhook url.
 2018-08-06 13:37:18 +01:00
Nicole Thomas
a9daa92d73
Merge pull request #47621 from dwoz/win_runas 
Runas any user even when shell is limited like winrm
 2018-08-05 14:29:50 -04:00
Daniel A. Wozniak
09c12532a3
Fix doc change conflicts 2018-08-03 12:41:40 -07:00
Daniel A. Wozniak
b6fce06d66
Update release notes with runas changes 2018-08-03 12:32:33 -07:00
Daniel A. Wozniak
25e7b041f1
Document runas password changes 2018-08-03 12:32:33 -07:00
rallytime
8ca89df7e8
Update backticks on job_cache docs 
There's an extra backtick after the `job_cache` link, and not enough
backticks around `keep_jobs` parameter.
 2018-08-03 12:03:37 -04:00
Nicole Thomas
b656c5884a
Merge branch 'develop' into return-codes 2018-08-03 11:49:29 -04:00
Gareth J. Greenaway
f8f6ff89ff
Merge branch 'develop' into jids_in_logs 2018-08-02 18:03:45 -07:00
Nicole Thomas
7fe663af33
Merge pull request #48864 from rallytime/pkg-deprecation 
Remove support for virtual packages in the pkg state
 2018-08-02 14:06:12 -04:00
Nicole Thomas
3dc6083a99
Merge branch 'develop' into return-codes 2018-08-02 13:28:39 -04:00
Nicole Thomas
c8df9e8b5a
Merge pull request #48854 from rallytime/merge-develop 
[develop] Merge forward from 2018.3 to develop
 2018-08-01 12:39:31 -04:00
rallytime
3f1c6a59a5
Remove support for virtual packages in the pkg state 
Refs #47375 and #47396
 2018-08-01 12:32:21 -04:00
Nicole Thomas
4b533d341e
Merge pull request #48823 from rallytime/fluorine-deprecations-nochown 
Remove deprecation warnings for "no_chown" option
 2018-08-01 12:23:56 -04:00
Nicole Thomas
0faa92edbb
Merge branch 'develop' into return-codes 2018-08-01 09:33:42 -04:00
Gareth J. Greenaway
121d68b2a5
Merge branch 'develop' into jids_in_logs 2018-07-31 16:09:56 -07:00
Erik Johnson
4382995951
Add return code documentation 2018-07-31 17:22:21 -05:00
rallytime
4bcdf16e21
Merge branch '2018.3' into 'develop' 
Conflicts:
  - salt/modules/mac_brew.py
  - salt/utils/minions.py
  - tests/integration/states/test_file.py
 2018-07-31 16:56:07 -04:00
Gareth J. Greenaway
3b8a4eed17
Adding some notes to the Fluorine release notes. Adding the default format for log_fmt_jid. 2018-07-31 09:19:06 -07:00
rallytime
4a51ed6ccf
Remove deprecation warnings for "no_chown" option 
The `no_chown` option in various functions was marked for removal in
Fluorine. This PR removes those warnings and updates the releaes notes
accordingly.

This PR also updates some of the Fluorine references in the zfs module
as the documentation can be more specific.
 2018-07-30 13:24:38 -04:00
rallytime
f46d4e0a26
[develop] Fluorine deprecations in cloud util (and related functions) 
Since `Fluorine` was misspelled in a couple of places and subsequently fixed,
the removal of the `cache_nodes_ip` function was missed.

This PR removes the deprecated `cache_nodes_ip` function from salt.utils.cloud.

This PR also updates some of the warn_util versions to match the removal/support
warning message. The `warn_util` version was set to `Fluorine`, but the "will be
removed in version" message stated Sodium. Sodium is the correct version, so the
docs and warn_util versions have been corrected.
 2018-07-30 11:46:13 -04:00
rallytime
436510796f
Merge branch '2017.7' into '2018.3' 
No conflicts.
 2018-07-27 11:44:07 -04:00
rallytime
5123b17ffd
Update linting docs to contain .testing.pylintrc use 
The PR tests use the ``.testing.pylintrc`` file, rather than the
more restrictive ``.pylintrc`` file. This can be a point of confusion
when following the current documentation.

The docs should reference the testing file and that the Jenkins PR
tests use ``.testing.pylintrc`` instead of ``.pylintrc``.

Fixes #48417
 2018-07-27 09:09:28 -04:00
Nicole Thomas
f05b86979a
Merge branch 'develop' into fix-40532 2018-07-26 14:20:48 -04:00
Paul Bruno
0d4ad6eac1 improve document example 2018-07-24 16:31:08 -04:00
Paul Bruno
faa57c76a8 make recommended changes, update documentation 2018-07-24 16:27:46 -04:00
Nicole Thomas
968e2e0b9e
Merge pull request #48713 from rallytime/merge-develop 
[develop] Merge forward from 2018.3 to develop
 2018-07-24 13:39:30 -04:00
Nicole Thomas
031741f079
Merge pull request #48697 from dgengtek/feature/ldap-starttls 
Feature: ldap authentication with starttls
 2018-07-23 15:43:50 -04:00
rallytime
597fc8009b
Merge branch '2018.3' into 'develop' 
Conflicts:
  - salt/grains/core.py
 2018-07-23 11:54:19 -04:00
Marc-Aurèle Brothier
54fa5f231e
cloudstack: fix wrong attribute name in doc 2018-07-23 15:55:54 +02:00
Nicole Thomas
9d176ab8e3
Merge branch 'develop' into fix-40532 2018-07-23 09:39:09 -04:00
Erik Johnson
7ad832c901
Add missing release notes mention of file.blockreplace changes 
These were added to the docstrings but not to the release notes for the
releases where the change took place.
 2018-07-21 10:12:52 -05:00
dgengtek
aa6458e441 Feature: ldap authentication with starttls 
fix #48655
 2018-07-21 14:23:59 +02:00
Bruno Binet
32b6d22cf2 Fix RST syntax issue in doc 2018-07-20 13:57:22 +02:00
Bruno Binet
37a41226d5 Add the "traverse" jinja filter 
which can be really useful in states to select some leaf pillar data or
fallback with a default value.
 2018-07-19 17:59:30 +02:00
Nicole Thomas
f0fc854ed4
Merge pull request #48532 from terminalmage/chipy 
Enhancements to slack engine and wtmp beacon
 2018-07-13 16:45:46 -04:00
Erik Johnson
04cbdd0a67
Double backticks for RST 2018-07-13 10:48:55 -05:00
rallytime
ae201823c1
Deprecate 'master_shuffle' in favor of 'random_master' 2018-07-12 13:43:06 -04:00
Erik Johnson
85eac61ccc
Add release notes for engine/beacon changes 2018-07-12 12:29:49 -05:00
Daniel Wallace
0e0ed41329
add to fluorine release notes 2018-07-12 11:29:37 -05:00
SaltStack Jenkins
69264f3332
Merge pull request #48446 from eugene-davis/influx-user-fixes 
Influx module user fixes
 2018-07-12 08:17:22 -05:00
Simon Sapin
c3bb0b9c14
Walkthrough: define the SLS accronym 
Some Googling suggests this is what it means.
 2018-07-11 21:09:17 +02:00
Renat Zaripov
6b69f196f8 Little fix in Vagrant cloud topic 2018-07-11 18:10:41 +03:00
Eugene Davis
722e5a3d86 Update fluorine release notes with state module change 2018-07-10 17:48:45 +02:00
rallytime
da646cb44f
Merge branch '2018.3' into 'develop' 
Conflicts:
  - doc/topics/event/events.rst
  - tests/integration/states/test_file.py
  - tests/unit/states/test_file.py
 2018-07-09 10:40:23 -04:00
Nicole Thomas
b8f2a86638
Merge pull request #48456 from cvedel/issue_48455 
support RunOnce in the VMware salt-cloud driver
 2018-07-09 09:42:24 -04:00
Carsten Brandt
6d9e83b8bd
Make example Saltfile work by default 
without Saltfile:

```
$ salt-ssh --saltfile=Saltfil '*' test.ping
No permissions to access "/var/log/salt/ssh", are you running as the correct user?
```

Adding a log file to the example Saltfile makes everything work as expected.
 2018-07-09 14:55:24 +02:00
Erik Johnson
56e8a1eb93
Improve the slack engine docs 
This explains the target/tgt_type options, adds some usage examples, and
makes a few other documentation tweaks.
 2018-07-07 21:41:01 -05:00
Christophe Vedel
b274ab78a7 support RunOnce in the VMware salt-cloud driver 2018-07-05 22:27:05 +02:00
rallytime
b55aa5b946
Merge branch '2018.3' into 'develop' 
Conflicts:
  - salt/modules/rabbitmq.py
  - salt/netapi/rest_tornado/saltnado.py
 2018-07-03 16:07:46 -04:00
Ch3LL
ef288f2a74
[2018.3] Remove In Progress Warning on 2017.7.7 2018-07-03 09:32:34 -04:00
Ch3LL
03ed5167fa
[2017.7] Remove In Progress Warning on 2017.7.7 2018-07-03 09:31:02 -04:00
Nicole Thomas
5b38019ca0
Merge pull request #48339 from terminalmage/backport-tojson-filter 
Backport tojson filter from #48309 to 2018.3
 2018-07-02 13:52:52 -04:00
Ch3LL
0cfd233c0e
[develop] Remove In Progress Warning on 2017.7.7 2018-07-02 10:23:42 -04:00
rallytime
bf6c788350
Merge branch '2018.3' into 'develop' 
Conflicts:
  - salt/client/ssh/__init__.py
  - salt/utils/thin.py
 2018-06-30 09:48:06 -04:00
Nicole Thomas
fdd1f24567
Merge pull request #48309 from terminalmage/fix-yaml-hacks 
Drop support for Python 2 unicode string literals in YAML renderer
 2018-06-30 09:07:55 -04:00
Nicole Thomas
fbbafc8de4
Merge pull request #48300 from rallytime/merge-develop 
[develop] Merge forward from 2018.3 to develop
 2018-06-30 08:58:27 -04:00
Nicole Thomas
89857ea8b9
Merge pull request #48297 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-06-30 08:57:34 -04:00
Erik Johnson
4433bec891
Add release notes for tojson jinja filter 2018-06-27 12:36:30 -05:00
Erik Johnson
ac36998801
Tweak docs to reflect backported filter 2018-06-27 12:28:34 -05:00
Erik Johnson
2320c8513c
Tweak docs to reflect backported filter 2018-06-27 12:27:47 -05:00
Erik Johnson
267544fd3e
Tweak release notes to reflect new jinja filter being backported 2018-06-27 12:26:35 -05:00
Erik Johnson
e34e39f0e2
Document filter deprecation 2018-06-27 12:23:29 -05:00
Erik Johnson
baf49d709d
Add release notes about json_encode_dict/json_encode_list deprecations 2018-06-27 10:29:31 -05:00
Erik Johnson
e2ea136757
Document filter deprecation 2018-06-27 10:29:31 -05:00
Erik Johnson
458b45b9e6
Minor clarification 2018-06-27 10:29:31 -05:00
Erik Johnson
7f473e6fde
Fix RST link syntax 2018-06-27 10:29:31 -05:00
Erik Johnson
b34f56b27b
Document change to YAML loader behavior in Fluorine release notes 2018-06-27 10:29:30 -05:00
Megan Wilhite
3b32fa0e51
Merge pull request #48327 from Ch3LL/rn_remove_develop 
Remove In Progress Warning for 2018.3.2 Release
 2018-06-27 09:43:01 -04:00
Ch3LL
962cb143bc
Remove In Progress Warning for 2018.3.2 Release 2018-06-26 17:09:30 -04:00
Ch3LL
dfce1ad5ed
Remove In Progress Warning for 2018.3.2 Release 2018-06-26 17:04:11 -04:00
Paul Bruno
aeb4e7ffe0 remove whitespace 2018-06-26 11:33:50 -04:00
Paul Bruno
4132e4e45e Merge branch 'feature_tag_ec2_spot_request' of https://github.com/thetoolsmith/salt into feature_tag_ec2_spot_request 2018-06-26 11:31:01 -04:00
Paul Bruno
916c59dddb update documentation for aws ec2 spot instance rerequest tagging support 2018-06-26 11:29:48 -04:00
Nicole Thomas
6d5e6e7eb5
Merge pull request #48261 from cbosdo/virt-init 
Virt init improvements
 2018-06-26 09:41:38 -04:00
Nicole Thomas
906c7e80be
Merge pull request #48220 from mnieber/patch-1 
Explain how to use a grain in a state
 2018-06-25 16:29:17 -04:00
Erik Johnson
6c33345f05
Fix typos in new mock_open docs 2018-06-25 14:05:54 -05:00
rallytime
6177d6e3c1
Merge branch '2018.3' into 'develop' 
Conflicts:
  - doc/ref/configuration/minion.rst
  - salt/client/__init__.py
  - salt/grains/core.py
  - salt/modules/timezone.py
  - tests/support/case.py
  - tests/unit/modules/test_file.py
  - tests/unit/roster/test_sshconfig.py
 2018-06-25 11:26:25 -04:00
Cédric Bosdonnat
614a213b3a
Fix virt images default location in docs 
virt images are not stored in /srv/salt/salt-images, but in
/srv/salt-images. Fix the documentation to reflect the truth.
 2018-06-25 16:53:24 +02:00
rallytime
c7bb8a50b0
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - salt/modules/x509.py
  - salt/runners/cloud.py
  - tests/unit/modules/test_state.py
 2018-06-25 10:41:06 -04:00
Nicole Thomas
27a0e95174
Merge pull request #48279 from terminalmage/mock_open-docs 
Add documentation/further enhancements to rewritten mock_open
 2018-06-25 09:12:29 -04:00
Erik Johnson
65c575ae9c
Fix spelling error 2018-06-24 13:27:09 -05:00
Erik Johnson
09aae0c82b
Add more examples and information on strict string types 2018-06-23 21:27:01 -05:00
Erik Johnson
8c069d105d
Add some mock_open docs 2018-06-23 15:05:18 -05:00
Nicole Thomas
67cb5563ef
Merge pull request #48252 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-06-22 11:13:41 -04:00
Nicole Thomas
731ec0a11a
Merge pull request #48037 from terminalmage/fix-custom-types-sync-docs 
Add "sync_mods" argument to state.apply/state.sls
 2018-06-21 15:57:02 -04:00
Nicole Thomas
0bae927048
Merge pull request #48249 from rallytime/2017.7.7-release-notes-update 
Update release notes for 2017.7.7
 2018-06-21 14:30:38 -04:00
Nicole Thomas
8e06471817
Merge pull request #48242 from asnell/asnell-patch-1 
Add sample list data via command line pillar
 2018-06-21 14:27:40 -04:00
rallytime
84ec655c24
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - doc/ref/configuration/minion.rst
  - salt/minion.py
  - salt/modules/dockermod.py
  - salt/modules/lxc.py
  - salt/utils/__init__.py
  - tests/unit/modules/test_mount.py
 2018-06-21 14:22:15 -04:00
rallytime
19c104b6cd
Update release notes for 2018.3.2 2018-06-21 13:03:39 -04:00
rallytime
36032c8ee7
Update release notes for 2017.7.7 2018-06-21 13:02:25 -04:00
asnell
f66bf60073
Add sample list data via command line pillar 2018-06-21 08:44:14 -04:00
Max Arnold
00798a9e33 Fix quite common Exception typos 2018-06-21 14:22:44 +07:00
Imran Iqbal
9fd9a09b4a
Fix typos in Jinja load_yaml example 2018-06-20 16:32:20 +01:00
Nicole Thomas
3a378a9036
Merge pull request #48162 from rallytime/merge-develop 
[develop] Merge forward from 2018.3 to develop
 2018-06-20 09:42:49 -04:00
Maarten Nieber
683bec42a7
Explain how to use a grain in a state 2018-06-20 08:08:40 +02:00
rallytime
dae65da256
Merge branch '2018.3.1' into '2018.3' 2018-06-19 14:56:06 -04:00
Nicole Thomas
1343b0e5f9
Merge pull request #48159 from emattiza/patch-1 
Remove Azure <1.0 Old Dependency Change Note
 2018-06-19 14:22:10 -04:00
Ky-Anh Huynh
860a8b9924
doc/dev/formulas: fix minor Jinja syntax errors 2018-06-18 10:42:44 +07:00
Erik Johnson
44c275698a
Actually it's more than just add/remove that updates the mine 2018-06-17 21:16:09 -05:00
Erik Johnson
0cb6996b07
Add release notes mention of docker.update_mine config option 2018-06-17 21:11:05 -05:00
rallytime
f23207002d
Merge branch '2018.3' into 'develop' 
Conflicts:
  - salt/states/file.py
  - tests/unit/beacons/test_btmp_beacon.py
  - tests/unit/beacons/test_wtmp_beacon.py
  - tests/unit/grains/test_core.py
 2018-06-15 17:00:59 -04:00
rallytime
398cc78224
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - .kitchen.yml
  - doc/topics/releases/2017.7.6.rst
  - salt/modules/timezone.py
  - tests/support/case.py
  - tests/unit/modules/test_timezone.py
 2018-06-15 16:51:45 -04:00
Evan Mattiza
49c5651280
Remove Azure <1.0 Old Dependency Change Note 
I understand there was a period where pyazure 1.0 was not working with salt per #27980 and seeing as this was resolved with newer versions, the note is no longer relevant.
 2018-06-15 15:05:05 -05:00
Nicole Thomas
7e62c0444e
Merge pull request #48048 from icyfork/aws_provider_with_role_arn_support 
cloud/aws: allow users to provide role_arn in configuration
 2018-06-15 13:11:42 -04:00
Nicole Thomas
e1e566d1f8
Merge pull request #48135 from rallytime/release-notes-2017.7 
Update the 2017.7.7 and 2017.7.8 release notes
 2018-06-14 17:22:06 -04:00
Erik Johnson
7f53d5a68e
Improve module environment docs 2018-06-14 13:46:32 -05:00
Bo Maryniuk
d1abcf2322
Update the documentation 2018-06-14 13:45:23 -05:00
Bo Maryniuk
ef96da833b
Add documentation for the configurable module environment 2018-06-14 13:45:23 -05:00
rallytime
7a97f157b3
Add missing v for tag reference 2018-06-14 12:10:18 -04:00
rallytime
2f2b69ed37
Add "in progress" notation to 2017.7.7 release notes 2018-06-14 12:08:47 -04:00
rallytime
06a1151a63
Add release notes file for 2017.7.7 2018-06-14 12:06:04 -04:00
rallytime
885b2862ce
Move 2017.7.7 release notes to 2017.7.8 2018-06-14 12:05:37 -04:00
rallytime
afe1e91972
Add "in progress" notation to 2018.3.2 release notes 2018-06-14 10:55:44 -04:00
rallytime
3e4272ac09
Add release notes for 2018.3.2 2018-06-14 10:53:40 -04:00
rallytime
88c584cb0d
Move 2018.3.2 release notes to 2018.3.3 2018-06-14 10:53:07 -04:00
rallytime
0fcf4c54d1
Add no_proxy option to cont/minion docs and Fluorine release notes 
Also cleans up a couple of items based on the feedback in #43764
 2018-06-13 15:49:00 -04:00
Brendan Beveridge
cc85427724
add support for no_proxy for apt pkg and generic http util 2018-06-13 15:41:09 -04:00
rallytime
cdb45874de
Merge branch '2017.7.6' into '2017.7' 
Conflicts:
  - doc/topics/releases/2017.7.6.rst
  - requirements/base.txt
 2018-06-13 15:04:55 -04:00
Mike Place
211f90df7c
Merge pull request #48028 from bbrandt/patch-1 
recommend --force-with-lease when rebasing
 2018-06-13 16:56:52 +02:00
Mike Place
c8d401843f
Merge pull request #48079 from neilvana/patch-1 
Fix broken links to setuptools documentation.
 2018-06-13 16:15:37 +02:00
rallytime
843171f5e3
Remove "in progress" info for 2018.3.1 release notes 2018-06-13 09:55:33 -04:00
rallytime
f3c9381d16
Remove "in progress" info for 2017.7.6 release notes 2018-06-13 09:55:25 -04:00
rallytime
fad6a0991e
Remove "in progress" info for 2018.3.1 release notes 2018-06-13 09:53:08 -04:00
rallytime
a3b3b0a0e1
Remove "in progress" info for 2017.7.6 release notes 2018-06-13 09:52:12 -04:00
rallytime
1b8d1c936b
Remove "in progress" info for 2017.7.6 release notes 2018-06-13 09:49:47 -04:00
Daniel Wallace
611ea92b8b
Merge branch 'develop' into aws_provider_with_role_arn_support 2018-06-13 08:47:55 -05:00
Neil Stoddard
666c517a25
Fix broken links to setuptools documentation. 2018-06-12 21:43:41 -05:00
Erik Johnson
24545204b3
Fix inaccurate gitfs_saltenv example in GitFS Walkthrough 2018-06-12 09:25:53 -05:00
Ben Brandt
bf6529d071
recommend --force-with-lease when rebasing 
Using `--force-with-lease` allows one to force push without the risk of
unintentionally overwriting someone else's work.

The git-push(1) man page states:

Usually, "git push" refuses to update a remote ref that is not an ancestor of the local ref used to overwrite it.

This option overrides this restriction if the current value of the remote ref is the expected value. "git push" fails otherwise.

Imagine that you have to rebase what you have already published. You will have to bypass the "must fast-forward" rule in order to replace the history you originally published with the rebased history. If somebody else built on top of your original history while you are rebasing, the tip of the branch at the remote may advance with her commit, and blindly pushing with --force will lose her work.

This option allows you to say that you expect the history you are updating is what you rebased and want to replace. If the remote ref still points at the commit you specified, you can be sure that no other people did anything to the ref. It is like taking a "lease" on the ref without explicitly locking it, and the remote ref is updated only if the "lease" is still valid.

References:
- https://developer.atlassian.com/blog/2015/04/force-with-lease/
- https://github.com/thoughtbot/guides/pull/363
 2018-06-11 22:53:11 -05:00
Nicole Thomas
037d198692
Merge pull request #48001 from rares-pop/dev/iepopr/add_salt-api_windows 
Add salt-api on Windows platform
 2018-06-11 17:17:58 -04:00
Erik Johnson
20f71ff6f6
Fix link without target in 2018.3.0 release notes 2018-06-11 12:01:34 -05:00
Ky-Anh Huynh
a9663588bf
cloud/aws: add notes for role_arn setting in provider configuration 2018-06-11 22:12:04 +07:00
Rares POP
3e0547b135 Add fluorine release notes for salt-api 
Signed-off-by: Rares POP <rares.pop@ni.com>
 2018-06-11 18:04:58 +03:00
Rares POP
895d8cee5c Merge branch 'develop' into dev/iepopr/add_salt-api_windows 
Signed-off-by: Rares POP <rares.pop@ni.com>
 2018-06-11 11:57:09 +03:00
Rares POP
c640b5cd42 Add salt-api on Windows platform 
salt-api is broken on Windows platform
due to pickling issues on the salt.loader.netapi
Workaround that by creating a runner class
that can be pickled.

Signed-off-by: Rares POP <rares.pop@ni.com>
 2018-06-11 11:38:08 +03:00
nicholasmhughes
4845e02b30
fixes #48019 add ability to pass image resource ID for vm creation 2018-06-10 22:41:32 -04:00
Erik Johnson
e4d67c5fd8
Update docs to include references to new "sync" argument 2018-06-08 12:29:19 -05:00
Erik Johnson
8289b07e24
Fix documentation on when custom types are synced 2018-06-08 09:33:35 -05:00
Nicole Thomas
c1c8b36639
RST Syntax Fix: code-blocks need a blank line 2018-06-08 09:38:58 -04:00
plastikos
1be25616a7
Add Jinja include relative paths to Fluorine release notes 2018-06-08 02:02:07 -06:00
Erik Johnson
04a80673a2
Clean up Sphinx build errors in develop branch 2018-06-06 20:19:44 -05:00
Ch3LL
01e8c59296
remove duplicate changelog line 2018-06-06 14:08:35 -04:00
Ch3LL
5b8534cfb3
Update 2018.3.1 release notes with new fixes 2018-06-06 14:07:11 -04:00