Vernon Cole
4cdb04b409
documentation for vagrant cloud & state
2017-10-11 04:49:47 -06:00
Nicole Thomas
7785919437
Merge pull request #43829 from rallytime/merge-develop
...
[develop] Merge forward from 2017.7 to develop
2017-10-05 16:09:23 -04:00
Nicole Thomas
9f25a1c2dd
Merge pull request #43503 from The-Loeki/high-out-by_id
...
Additional highstate output modes; changes_id, filter_id, terse_id, full_id
2017-10-01 10:14:26 -04:00
rallytime
a38ceab7cf
Merge branch '2017.7' into 'develop'
...
Conflicts:
- salt/cli/batch.py
- salt/master.py
- salt/utils/path.py
- tests/unit/modules/test_state.py
2017-09-29 11:48:33 -04:00
garethgreenaway
61280cc0c3
Merge branch 'develop' into release-note-formatting
2017-09-28 19:49:12 -07:00
Nicole Thomas
3f77571dad
Merge branch 'develop' into high-out-by_id
2017-09-28 13:27:47 -04:00
Ch3LL
50779c3b1c
Add note to nitrogen release notes about pip for cent6
2017-09-28 11:50:54 -04:00
Simon Dodsley
cdafbe2068
Update Oxygen Release notes with new grains and module
...
Also do a final cosmetic fix to the purefa module documentation
2017-09-28 07:26:30 -07:00
rallytime
d862a6f3f2
Fix some formatting issues on the oxygen release notes page
2017-09-28 09:52:04 -04:00
Mike Place
6a25bf4475
Merge pull request #42349 from coredumb/saltclass
...
New pillar/master_tops saltclass module
2017-09-28 14:26:45 +02:00
rallytime
dfef4a722c
Merge branch '2016.11' into '2017.7'
...
No conflicts.
2017-09-27 11:48:39 -04:00
Nicole Thomas
fb86935d99
Merge pull request #43761 from Ch3LL/release_2017.7.2
...
Release Notes for 2017.7.2
2017-09-27 10:34:51 -04:00
Ch3LL
caf5795856
add mac patch notes
2017-09-26 17:27:29 -04:00
Ch3LL
3d5fce0955
Add 2017.7.2 Release Notes
2017-09-26 17:21:24 -04:00
rallytime
120f49f2c4
Merge branch '2016.11' into '2017.7'
...
Conflicts:
- salt/daemons/masterapi.py
- salt/master.py
- salt/runners/cache.py
2017-09-26 16:46:43 -04:00
rallytime
23bb4a5dde
Add GPG Verification section to Contributing Docs
...
When we enable GPG Verification for pull request reviews, we should
make sure there is information available in our Contributing docs
about how to sign commits.
2017-09-26 10:16:56 -04:00
rallytime
babad12d83
Revise "Contributing" docs: merge-forwards/release branches explained!
...
Fixes #43650
The merge-forward process needs a more prominent position and explanation
in the contributing documentation. This change attempts to explain this
process a little more fully and incorporates some changes to how we are
handling "main" release branches, "dot" release branches, and "develop"
in a more complete context with merge-forwards.
2017-09-25 15:23:01 -04:00
Ronald van Zantvoort
a2234e45e2
Update release note docs regarding _id highstate output modes
2017-09-25 18:37:48 +02:00
Ronald van Zantvoort
bfbca748e2
highstate output: Document additional output modes
2017-09-25 18:32:52 +02:00
rallytime
281cbbe048
Merge branch '2017.7' into 'develop'
...
Conflicts:
- salt/cloud/clouds/libvirt.py
- salt/daemons/masterapi.py
- salt/modules/file.py
- salt/modules/yumpkg.py
- salt/states/archive.py
- salt/states/file.py
- salt/utils/files.py
- salt/utils/minions.py
2017-09-25 09:40:18 -04:00
rallytime
e0ae50e489
Merge branch '2017.7' into 'develop'
...
Conflicts:
- pkg/salt.bash
- salt/client/mixins.py
- salt/minion.py
- salt/modules/aptpkg.py
- salt/modules/boto_vpc.py
- salt/modules/win_pkg.py
- salt/utils/reactor.py
- tests/unit/utils/test_reactor.py
2017-09-22 10:24:04 -04:00
rallytime
fca4e5563a
Merge branch '2016.11' into '2017.7'
...
Conflicts:
- salt/modules/win_pkg.py
- tests/unit/utils/test_parsers.py
2017-09-22 09:40:03 -04:00
Raymond Piller
d91c47c6f0
Salt Repo has Deb 9 and 8
2017-09-21 10:24:41 -04:00
Nicole Thomas
f66eb1c5ad
Merge pull request #43588 from gtmanfred/do
...
digitalocean should be one word.
2017-09-21 09:25:38 -04:00
Raymond Piller
5f47ef721c
Salt Repo has Deb 9 and 8
2017-09-20 21:41:08 -05:00
Daniel Wallace
afaf76d0ba
add release note
2017-09-19 12:50:50 -06:00
Daniel Wallace
3bae894306
digitalocean should be one word.
...
Everything on their webpage is a reference to DigitalOcean
2017-09-19 12:47:16 -06:00
rallytime
57b9d642c2
Merge branch '2016.11.8' into '2016.11'
...
No conflicts.
2017-09-18 16:40:05 -04:00
Mike Place
1a619708c1
Enhance engines docs
...
Add a note about formatting to make it more clear.
2017-09-18 13:44:44 -06:00
Damon Atkins
d4981a2717
Update doco
2017-09-14 12:25:30 -04:00
rallytime
bfcfcd75e8
Merge branch '2017.7' into 'develop'
...
Conflicts:
- salt/fileclient.py
- salt/loader.py
- salt/minion.py
- salt/modules/alternatives.py
- salt/modules/genesis.py
- tests/unit/modules/test_hosts.py
- tests/unit/modules/test_ini_manage.py
2017-09-13 15:15:04 -04:00
Mike Place
9767e46ce4
Merge branch 'develop' into cisc_oxygen_release_notes
2017-09-13 10:45:24 -06:00
Erik Johnson
b85c8510c7
Improve the reactor documentation
...
This reorganizes the reactor docs and includes examples of the new
reactor SLS config syntax.
2017-09-13 10:35:23 -05:00
Mike Place
15ffecd4a7
Give the name of the roster
2017-09-12 15:44:26 -06:00
Mike Place
eba40686e8
Add information about cimc to release notes
2017-09-12 14:39:00 -06:00
Mike Place
27315c31c8
Add release note about ssh rosters
2017-09-12 10:41:06 -06:00
Olivier Mauras
139e065ce9
New pillar/master_tops saltclass module
2017-09-12 15:53:39 +02:00
rallytime
984fa35062
Merge branch '2017.7' into 'develop'
...
Conflicts:
- salt/key.py
- salt/modules/mount.py
- salt/modules/system.py
- tests/unit/modules/test_mount.py
- tests/unit/modules/test_pam.py
- tests/unit/modules/test_parted.py
2017-09-11 12:55:39 -04:00
rallytime
ef7b4242c3
Merge branch '2016.11' into '2017.7'
...
No conflicts.
2017-09-11 12:24:10 -04:00
rallytime
68f529ee5e
Add 2016.11.8 release notes
2017-09-11 10:58:16 -04:00
Nicole Thomas
d97a680372
Merge pull request #43333 from damon-atkins/2016.11
...
Docs are wrong cache_dir (bool) and cache_file (str) cannot be passed as params + 1 bug
2017-09-06 10:21:34 -04:00
rallytime
7b07b58396
Merge branch '2016.11' into '2017.7'
...
Conflicts:
- salt/key.py
- salt/modules/yumpkg.py
2017-09-06 09:44:34 -04:00
Damon Atkins
92de2bb498
Update doco
2017-09-06 12:31:51 +10:00
Nicole Thomas
f19274e1b4
Merge pull request #43222 from rallytime/oxygen-warnings-env
...
Remove deprecation warnings for "env"
2017-09-05 18:24:54 -04:00
Aneesh Agrawal
ba63920874
Support states returning a list for ret['comment']
...
Some states are complicated and multiple subparts,
or maybe cross-call into __states__ if they manage subresources.
In these cases, they will have multiple comments.
Make this more ergonomic by supporting a list of strings as the
value for ret['comment'] in state returns and documenting this.
By joining comments on newlines, it is possible to combine
single-line and multi-line comments cleanly, as opposed to e.g. commas.
The driving impetus for this is some of the boto modules.
An update to the boto_sqs module is included as an example.
Add a check that outgoing state return data has the right shape,
and add a testcase as well.
Fix the NPM state tests and the saltmod runner & wheel state functions
to comply with the prescribed format.
2017-09-05 19:52:42 +00:00
Nicole Thomas
a972c4fb8c
Merge pull request #42840 from StreetHawkInc/update_azurearm
...
Update salt-cloud azurearm to work with latest sdk
2017-08-30 12:01:34 -04:00
rallytime
0d5a46dbaa
Update release branch section with a few more details
2017-08-29 09:38:11 -04:00
rallytime
375b1faa92
Remove deprecation warnings for "env"
...
Removal of these deprecation warnings has no behavioral effect, as
support for "env" instead of "saltenv" in these cases has already
been removed. Only the warning text will no longer display to users.
2017-08-28 10:37:05 -04:00
rallytime
6fad40454a
Merge branch '2017.7' into 'develop'
...
Conflicts:
- salt/modules/aptpkg.py
- salt/utils/napalm.py
2017-08-28 09:28:41 -04:00
rallytime
d40eba6b37
Merge branch '2016.11' into '2017.7'
...
Conflicts:
- salt/states/git.py
2017-08-25 16:07:27 -04:00
