rallytime
36b54ee79b
Remove extra line
2015-04-17 12:53:58 -06:00
rallytime
93a858c591
Added release note for 2014.7.5 release
2015-04-17 12:53:50 -06:00
Colton Myers
000de95974
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
.pylintrc
doc/ref/runners/all/salt.runners.nacl.rst
doc/topics/cloud/config.rst
salt/cli/salt.py
salt/client/mixins.py
salt/client/ssh/__init__.py
salt/loader.py
salt/minion.py
salt/modules/cassandra_cql.py
salt/modules/gpg.py
salt/modules/grains.py
salt/modules/iptables.py
salt/modules/yumpkg.py
salt/netapi/rest_cherrypy/app.py
salt/renderers/pyobjects.py
salt/returners/mysql.py
salt/runners/jobs.py
salt/state.py
salt/states/file.py
salt/states/service.py
salt/utils/minions.py
tests/integration/__init__.py
tests/integration/netapi/rest_tornado/test_app.py
tests/integration/states/cmd.py
2015-04-16 12:15:44 -06:00
Colton Myers
ff8561df8d
Add minor CVEs to 2014.7.4 release notes
2015-04-15 19:01:28 -06:00
Oliver Bestwalter
20ce197674
Add mention of Windows release candidates
...
... so the windows folks realize, that they can test RCs easily as well :)
2015-04-15 21:32:48 +02:00
Wolodja Wentland
c52e9a94af
Remove enabled option from pkgrepo.managed
...
The 'enabled' option was highly ambiguous in that pkgrepo.managed also supports
a 'disabled' one that should be enough to express if a repository should be
enabled or disabled. It is also assumed that users who use pkgrepo.managed also
intend to use the repository later on which is why we set 'disabled' to False by
default.
This closes #22147
2015-04-14 18:05:03 +01:00
Colton Myers
9099884809
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
...
Conflicts:
doc/topics/cloud/config.rst
salt/modules/win_disk.py
salt/modules/yumpkg.py
salt/pillar/s3.py
salt/states/service.py
salt/utils/event.py
tests/integration/netapi/rest_tornado/test_app.py
tests/integration/netapi/test_client.py
tests/unit/states/archive_test.py
2015-04-14 11:03:03 -06:00
rallytime
becc997de4
Apply release note fix to develop branch
2015-04-13 15:34:24 -06:00
rallytime
fb03af37d3
Add note about missing state internal keyword arguments to release notes
2015-04-13 15:29:55 -06:00
rallytime
1f243d6276
Apply release note change to develop
2015-04-13 13:53:03 -06:00
rallytime
9eb273f097
Add batch matching bug note to known issues in 2014.7.4 release notes
2015-04-13 13:35:48 -06:00
shanedlee
c874ca8c20
Added additional details regarding windows implementation
2015-04-09 11:32:13 -04:00
Kevin Bowling
f324d38f8c
2015.2 relnotes edits
2015-04-06 14:36:51 -07:00
rallytime
5cd2db23eb
Update sidebar and releasecandidate docs for rc2
2015-04-02 16:42:01 -06:00
Nitin Madhok
bfa4ef77e2
Merge branch 'develop' of https://github.com/saltstack/salt into vmware-cloud-driver
2015-03-31 12:56:19 -04:00
Nitin Madhok
931ece7d20
Fixing some spninx errors and violations
2015-03-31 12:54:32 -04:00
Nicole Thomas
44c7eb4d4b
Merge pull request #22169 from basepi/merge-forward-develop
...
Merge forward from 2015.2 to develop
2015-03-31 09:21:36 -06:00
Colton Myers
124ad51c40
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
doc/ref/index.rst
doc/topics/eauth/index.rst
salt/beacons/__init__.py
salt/beacons/service.py
salt/loader.py
salt/minion.py
salt/output/nested.py
2015-03-30 15:10:17 -06:00
Mike Place
4538ea629f
Merge pull request #22057 from jfindlay/opts_prefix
...
remove default prefix of '-' in archive.tar and archive.cmd_unzip
2015-03-30 10:45:11 -06:00
Justin Findlay
0e57aeb3d0
mention console log colors in beryllium release notes
2015-03-26 23:21:30 -06:00
Justin Findlay
4b2ebfaf7c
document '-' prefix removal in Berrylium notes
2015-03-26 22:23:11 -06:00
Nicole Thomas
f38b67b687
Merge pull request #22041 from basepi/merge-forward-2015.2
...
[2015.2] Merge forward from 2014.7 to 2015.2
2015-03-26 10:30:21 -06:00
Colton Myers
afeb4743a1
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
2015-03-26 09:45:55 -06:00
Mike Place
6fb70ea874
Add etcd sdb to 2015.2 release notes
2015-03-26 09:13:28 -06:00
Colton Myers
74dcd7df1c
Add 2014.7.4 release notes
2015-03-26 09:03:35 -06:00
Justin Findlay
7ac7b74621
add release note about reactor users for runners
2015-03-25 21:14:10 -06:00
Justin Findlay
9b1e3f7a2a
wrap at 80 chars
2015-03-25 21:12:51 -06:00
Justin Findlay
88add58cef
misc cachedout edits
2015-03-25 21:10:48 -06:00
Thomas S Hatch
c58fe8bc07
Update release notes back to Jan 29th
2015-03-25 13:23:38 -06:00
Colton Myers
b0fe5cc955
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
salt/fileclient.py
salt/minion.py
tests/unit/pyobjects_test.py
2015-03-25 12:04:30 -06:00
Colton Myers
7ba2404cc9
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
...
Conflicts:
conf/master
conf/minion
doc/ref/configuration/master.rst
salt/loader.py
salt/minion.py
salt/modules/ssh.py
salt/output/nested.py
salt/utils/network.py
2015-03-25 09:28:04 -06:00
Mike Place
2639f4b566
Release note changes
2015-03-24 17:02:18 -06:00
Mike Place
53846aa284
Merge pull request #21958 from cachedout/2015_2_mm_note
...
Add known multimaster issue to 2015.2 notes
2015-03-24 15:50:16 -06:00
Mike Place
98642d7b87
Add known multimaster issue to 2015.2 notes
2015-03-24 15:49:58 -06:00
Mike Place
e6d70629df
2014.7.3 release notes
2015-03-24 15:48:05 -06:00
Justin Findlay
1436d4011a
add versions_report update to release notes
2015-03-23 14:02:16 -06:00
Thomas Jackson
2512a0841d
Add LazyLoader and Singleton auth to 2015.2 release notes
2015-03-23 11:42:48 -07:00
Colton Myers
fd93491a5f
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
salt/cloud/clouds/linodepy.py
salt/master.py
salt/modules/boto_route53.py
salt/modules/virt.py
salt/renderers/gpg.py
salt/runners/doc.py
salt/runners/jobs.py
salt/runners/manage.py
salt/runners/virt.py
salt/utils/event.py
salt/utils/http.py
2015-03-16 15:12:02 -06:00
Mike Place
87bd28b8cb
Note the issue number
2015-03-11 12:19:51 -06:00
Mike Place
9d5da3b878
Note the change in release notes
2015-03-11 12:19:51 -06:00
Seth House
c673e24a66
Merge pull request #21529 from whiteinge/doc-current-release-shortcut
...
Replace current release Jinja variable with rST substitution
2015-03-10 22:11:07 -04:00
Seth House
43709e0e10
Replace current release Jinja variable with rST substitution
...
Follow-up to the changes in #21286 .
2015-03-10 22:06:59 -04:00
Erik Johnson
d25677e954
Merge branch '2015.2' into 2015.2-develop
2015-03-10 17:47:30 -05:00
Mike Place
393cf9c13a
Note the change to tcp keepalives in release notes
2015-03-10 10:45:16 -06:00
Colton Myers
d17c908b42
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
doc/topics/pillar/index.rst
salt/beacons/diskusage.py
salt/beacons/network_info.py
salt/minion.py
salt/modules/iptables.py
salt/modules/nacl.py
salt/modules/win_firewall.py
2015-03-09 12:52:14 -06:00
rallytime
e9402e7564
Remove "Lithium" and change to "2015.2.0" for versionadded tags
2015-03-05 12:44:22 -07:00
Alexander Schwartz
0887dfe5d8
make latest 2014.7.x releases visible in documentation
2015-03-03 17:14:06 -07:00
Erik Johnson
94d55889d7
Resolve merge conflicts
2015-02-28 12:35:25 -06:00
Justin Findlay
367f14a4d0
add args to cmd.script_retcode
2015-02-27 10:52:15 -07:00
Pedro Algarvio
62f868a076
Merge branch '2015.2' into develop
2015-02-27 10:02:47 +00:00
