Colton Myers
b2a80b195e
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
2015-02-12 11:44:57 -07:00
rallytime
3f9af9f7d3
Change the release notes title to 2014.7.2
2015-02-12 11:26:17 -07:00
Colton Myers
eba17606b4
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
2015-02-09 15:37:25 -07:00
Erik Johnson
3e321fdb48
Add file-locking bugfix to 2014.7.2 release notes
2015-02-09 11:32:20 -06:00
Colton Myers
56520f4ac9
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
...
Conflicts:
conf/minion
salt/modules/cron.py
salt/modules/pip.py
salt/modules/tls.py
2015-02-06 13:00:14 -07:00
Justin Findlay
a44368001b
fix pip venv regression, deprecate activate param
...
Fixes #20191 . If `bin_env` points to a virtualenv, there is no need to
activate that virtualenv for pip to install into the virtualenv. Also
update associated unit test.
2015-02-05 12:36:42 -07:00
Justin Findlay
b87615e277
document lowercase removal change
2015-02-03 16:27:41 -07:00
Colton Myers
ca6ecc0f0f
Add only_upgrade to 2015.2 release notes
2015-01-30 16:07:39 -07:00
rallytime
80bfa4a2a6
Add beacons section to 2015.2.0 release notes
2015-01-26 20:26:51 -07:00
Pedro Algarvio
cdbbe4c0dd
Fix typos
2015-01-24 03:16:52 +00:00
Mike Place
b8e9249c80
Added docs for Lithium deprecations
2015-01-24 03:16:49 +00:00
Colton Myers
f609366dee
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
...
Conflicts:
doc/conf.py
2015-01-22 16:53:22 -07:00
Colton Myers
f1e7661973
Release 2014.7.1 (docs sidebar and release date for release notes)
2015-01-22 16:52:21 -07:00
Colton Myers
098c39596a
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
...
Conflicts:
salt/templates/rh_ip/rh5_eth.jinja
salt/templates/rh_ip/rh6_eth.jinja
salt/utils/templates.py
2015-01-21 11:19:06 -07:00
Kevin Bowling
494543c5bc
Add freebsdkmod changes to 2014.7.2 relnotes
2015-01-20 02:09:32 -07:00
Colton Myers
d1b201e2bf
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
...
Conflicts:
salt/runners/manage.py
salt/utils/cloud.py
2015-01-15 16:20:48 -07:00
Colton Myers
228ada2890
Add release notes for 2014.7.2
2015-01-14 15:17:33 -07:00
Colton Myers
2e364ac249
Add more release notes for 2014.7.1
2015-01-14 15:17:21 -07:00
Colton Myers
3ce5eb2838
Merge branch '2014.7' into merge-forward-2015.2
...
Conflicts:
salt/modules/archive.py
salt/modules/brew.py
salt/modules/pip.py
tests/unit/modules/archive_test.py
tests/unit/modules/pip_test.py
2015-01-09 11:39:09 -07:00
Mike Place
b419366443
Release note note
...
Fixes #18551
2015-01-08 16:41:20 -07:00
Colton Myers
139bd8df5b
Add salt-ssh mine to lithium release notes
2014-12-23 11:35:40 -07:00
Colton Myers
321413e638
Rename lithium release notes to 2015.2.0
2014-12-23 11:34:52 -07:00
Colton Myers
7fc1cc2ba2
Merge branch '2014.7' into merge-forward
...
Conflicts:
doc/topics/releases/2014.7.1.rst
salt/modules/mdadm.py
salt/modules/mine.py
salt/modules/win_firewall.py
salt/modules/win_groupadd.py
salt/modules/win_service.py
salt/modules/win_system.py
salt/modules/win_useradd.py
salt/runners/jobs.py
tests/unit/modules/mdadm_test.py
2014-12-22 13:33:53 -07:00
Colton Myers
9d5e05a381
Add more release notes for 2014.7.1
2014-12-18 14:19:52 -07:00
Colton Myers
e0b6f1623c
Add publish wrapper to lithium release notes
2014-12-16 16:13:03 -07:00
Thomas Jackson
3f4b2cc8bb
Comma cleanup
2014-12-12 11:31:43 -08:00
Thomas Jackson
498a612078
Whitespace cleanup
...
Conflicts:
doc/topics/cloud/linode.rst
doc/topics/cloud/misc.rst
doc/topics/cloud/parallels.rst
doc/topics/cloud/proxmox.rst
Conflicts:
doc/topics/development/architecture.rst
doc/topics/development/translating.rst
2014-12-11 07:53:19 -08:00
Thomas Jackson
52fe04db18
Remove trailing whitespace
2014-12-11 07:53:19 -08:00
Thomas S Hatch
3d73816507
Merge branch '2014.7' into develop
...
Conflicts:
salt/modules/virtualenv_mod.py
salt/states/network.py
salt/utils/parsers.py
2014-12-09 10:59:18 -07:00
Erik Johnson
00bf5daff8
Add bugfix for #17963 to 2014.7.1 releae notes
2014-12-08 08:45:03 -06:00
Colton Myers
79e5e80ad1
Add state.single to salt-ssh release notes for lithium
2014-12-04 14:35:52 -07:00
Pedro Algarvio
50105aa001
Merge branch '2014.7' into develop
...
Conflicts:
salt/modules/boto_secgroup.py
salt/modules/boto_vpc.py
tests/unit/modules/boto_vpc_test.py
2014-12-01 23:07:39 +00:00
Erik Johnson
b11542dab9
Update 2014.7.1 release notes
2014-11-28 16:55:49 -06:00
Colton Myers
397d61b1fc
Add lithium release notes
2014-11-25 15:25:46 -07:00
Colton Myers
754baafcf7
Merge branch '2014.7' into develop
2014-11-24 14:38:46 -07:00
Erik Johnson
55b80853f6
Add new release notes file for 2014.7.1
2014-11-24 10:36:46 -06:00
Erik Johnson
22962d097e
Fix wording in 2014.1.1 release notes
...
As this was the first bugfix release for 2014.1.0, it should not be
described as "another" bugfix release.
2014-11-24 10:35:47 -06:00
Erik Johnson
c0d9b84a86
Add 2014.7.0 to toctree
2014-11-24 09:46:48 -06:00
Colton Myers
dc43840cee
Merge branch '2014.7' into merge-forward
...
Conflicts:
salt/modules/glusterfs.py
salt/modules/macports.py
salt/modules/makeconf.py
salt/modules/mdadm.py
salt/modules/smartos_vmadm.py
salt/modules/zypper.py
salt/utils/event.py
tests/integration/netapi/rest_tornado/test_app.py
tests/unit/netapi/rest_tornado/test_handlers.py
2014-11-21 12:05:32 -07:00
Ronan Amicel
3d2b44a14b
Fix typo in 2014.7.0 release notes
...
virturalenv → virtualenv
2014-11-20 11:26:01 +01:00
Elias Probst
b0ead3f326
Typo in 2014.7.0 release notes (documentaiton → documentation).
2014-11-19 20:47:18 +01:00
Nitin Madhok
31ffaff1e7
Fixes #18114
2014-11-18 03:06:11 -05:00
C. R. Oldham
79d2de5d44
Merge remote-tracking branch 'upstream/2014.7' into develop
2014-11-10 16:33:50 -07:00
C. R. Oldham
25f7bf111a
Add breaking change notice for module.run in 2014.1.0
2014-11-10 16:28:21 -07:00
Colton Myers
9841103427
Merge branch '2014.7' into develop
...
Conflicts:
salt/modules/rabbitmq.py
salt/states/rabbitmq_cluster.py
2014-11-10 09:59:17 -07:00
Colton Myers
69fa6b2e3c
Fix the release notes note
2014-11-10 09:51:21 -07:00
Colton Myers
cf45d1051d
Merge branch '2014.7' into develop
2014-11-05 11:28:20 -07:00
Colton Myers
4149716bf2
Add note to release notes about pillar/compound matching in mine/publish
2014-11-05 11:27:23 -07:00
Colton Myers
f625c21d77
Merge branch '2014.7' into mergeforward
...
Conflicts:
salt/cloud/clouds/ec2.py
salt/daemons/flo/worker.flo
salt/master.py
salt/minion.py
salt/modules/lxc.py
salt/states/win_update.py
salt/states/zk_concurrency.py
2014-10-30 17:42:36 -06:00
Seth House
36ca21de0c
Added the salt-api merge and recent additions to 2014.7 release notes
2014-10-29 18:15:03 -05:00
