Commit Graph

7714 Commits

Author SHA1 Message Date
rallytime
a466a4880f
Merge branch '2017.7.7' into '2017.7'
No conflicts.
2018-07-10 16:49:13 -04:00
Ch3LL
3cf335b0b9
Update release versions for the 2017.7 branch 2018-07-03 09:37:58 -04:00
Ch3LL
03ed5167fa
[2017.7] Remove In Progress Warning on 2017.7.7 2018-07-03 09:31:02 -04:00
Ch3LL
47845ba810
Update release versions for the 2017.7 branch 2018-06-26 15:51:46 -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
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
Erik Johnson
c5802ad465
Fix the version number in versionadded
2017.7.7 has already been released
2018-06-17 21:47:33 -05: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
Erik Johnson
de05097b20
Add docs for new config option 2018-06-17 21:10:50 -05:00
rallytime
a0ad794132
Update release notes for 2017.7.7 2018-06-17 15:29:06 -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
rallytime
8893bf0d4c Update man pages for 2017.7.7 2018-06-14 17:43:13 +00:00
rallytime
217005b8f1
Add missing v for tag reference 2018-06-14 12:12:42 -04: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
d53569d1e3
Add release notes file for 2017.7.7 2018-06-14 11:48:07 -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
rallytime
1b8d1c936b
Remove "in progress" info for 2017.7.6 release notes 2018-06-13 09:49:47 -04:00
rallytime
9a0f4d190a
Update release versions for the 2017.7 branch 2018-06-13 09:47:12 -04:00
Erik Johnson
24545204b3
Fix inaccurate gitfs_saltenv example in GitFS Walkthrough 2018-06-12 09:25:53 -05: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
Erik Johnson
af51e16f23
Use more elegant RST syntax 2018-05-31 15:28:25 -05:00
Erik Johnson
d37f7e4f04
Add 2017.7.6 release notes 2018-05-31 15:28:25 -05:00
Erik Johnson
9dddeeefab
Improve documentation on syncing states 2018-05-31 15:28:25 -05:00
Erik Johnson
f465fa3ca7
Add best practices docs for writing states 2018-05-31 15:28:25 -05:00
Erik Johnson
93ee5ee2b0
Fix all Sphinx warnings
Well, all but one, which we expect to see
2018-05-31 15:28:25 -05:00
Erik Johnson
64b9b4d0b8
Clarify that name would override the id declaration 2018-05-31 15:28:24 -05:00
rallytime
58dee4c829
Remove sentence about the release being in progress 2018-05-29 16:27:43 -04:00
rallytime
b3dcb7330e
Remove "in progress" too 2018-05-29 16:26:28 -04:00
rallytime
99e1df7823
Update 2017.7.6 release notes: remove "unreleased" text
In preparation for the 2017.7.6 release, remove the "unreleased" text
from the release notes.
2018-05-29 15:31:51 -04:00
Daniel Wallace
a1c1b5b5cf
allow tornado 5.0 to be installed only for python2 2018-05-29 13:57:54 -05:00
Nicole Thomas
cffc9b7806
Merge branch '2017.7' into fix_46981 2018-05-24 12:52:59 -04:00
twangboy
81308a4a44
Add release notes for 2017.7.7 2018-05-23 13:47:08 -06:00
Nicole Thomas
0e87559ee3
Merge pull request #47781 from rallytime/update-linode-sizes
Update cloud test profile and docs to use new Linode size lables
2018-05-23 09:09:12 -04:00
rallytime
a90c1b760e
Update cloud test profile and docs to use new Linode size lables
Linode changed their size labels recently, so the cloud test profile
and the docs need to be updated accordingly.

The new sizes can be found by running `salt-cloud --list-sizes <my-linode-config>`.

For example, the `Linode 2048` size is now `Linode 2GB`.
2018-05-22 16:00:39 -04:00
rallytime
e458f4a031
Merge branch '2017.7.6' into '2017.7'
No conflicts.
2018-05-21 10:34:10 -04:00
Ch3LL
d4aa83b92d
Add changelog to 2017.7.6 release notes 2018-05-21 10:01:00 -04:00
rallytime
1503f1020f
Merge branch '2017.7.6' into '2017.7'
No conflicts.
2018-05-14 10:56:21 -04:00
Mike Place
6d2ddd050f
One more grammar fixup 2018-05-11 11:32:33 -05:00
Mike Place
2d5ff01261
Grammar fix 2018-05-11 09:18:55 -05:00
Ch3LL
138847c9c4
Update debian install docs to reflect new latest debian releases 2018-05-11 09:51:50 -04:00
Erik Johnson
806ffb298a
Add masterless mode docs to gitfs tutorial 2018-05-08 13:46:47 -05:00
rallytime
48ecb78dec [2017.7.6] Update man pages 2018-05-07 20:31:38 +00:00