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
rallytime
dda39d4e63
Merge branch '2016.11' into 'develop'
...
Conflicts:
- salt/minion.py
- salt/modules/file.py
- salt/modules/grains.py
- salt/utils/gitfs.py
2017-02-16 12:18:46 -07:00
Daniel Wallace
3172e88700
Add release notes for cisco proxy minions added in Carbon
2017-02-16 10:05:33 -06:00
Jason Pack
45268d6d56
Merge branch 'patch-2' of https://github.com/spidercensus/salt into develop
2017-01-27 09:46:55 -05:00
rallytime
494a06bee2
Merge branch '2016.11' into 'develop'
...
Conflicts:
- doc/ref/configuration/minion.rst
2016-12-20 10:03:44 -07:00
rallytime
c6e191ad0d
Remove doc markup references from 2016.11 branch
2016-12-19 15:14:37 -07: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
Joseph Hall
71b787e250
Add Azure ARM docs for 2016.11.0
2016-12-08 12:43:18 -07: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
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
Ch3LL
e95f88fbe3
add docs for hash_type change to sha256
2016-12-02 09:28:50 -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
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
Mircea Ulinic
3cda665640
Fix RST link format ( #37958 )
2016-11-29 13:24:14 -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
Mircea Ulinic
529b64dbeb
Inclued NAPALM in 2016.11 release notes
2016-11-29 13:46:45 +00:00
Nicole Thomas
8f986b28dc
Remove release candidate doc ref from 2016.11.0 release notes ( #37931 )
2016-11-28 13:49:28 -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
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
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
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
rallytime
6332da5c44
Prep release notes for 2016.11
2016-10-31 13:05:24 -06:00
