valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
43,364 Commits 24 Branches 182 Tags 341 MiB
fb7e5630d8
Commit Graph

391 Commits

Author SHA1 Message Date
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
rallytime
933be7c476 Merge branch '2014.7' into develop 
Conflicts:
	salt/master.py
	salt/returners/mysql.py
	salt/utils/cloud.py
	salt/utils/minions.py
 2014-10-25 08:54:42 -06:00
Henrik Holmboe
1fc008bf25 Point to the correct latest 2014.1.13 release 
This is recurring and #12720 is tracking the issue.

Conflicts:
	doc/topics/releases/index.rst
 2014-10-24 16:27:11 -06:00
rallytime
617d777fa9 Release notes for 2014.1.13 2014-10-24 16:22:53 -06:00
Erik Johnson
d1e867c718 Remove known issue comment for salt-ssh 2014-10-24 16:16:33 -05:00
rallytime
b90ba8cf4e Added updates to 2014.7.0 release notes 2014-10-24 09:29:13 -06:00
Thomas S Hatch
e9b29ea3e6 Redirect tot he correct page 2014-10-23 18:24:32 -06:00
Erik Johnson
d19c6b16ce Improve wording of RPM changes in helium release notes 2014-10-23 12:00:35 -05:00
Erik Johnson
b261c663fa Add notice of new packages for Helium release 2014-10-23 11:48:40 -05:00
Sean Coates
9e1685da6f change Release Candidate installation doc from rc3 to rc4 2014-10-23 11:32:53 -04:00
Erik Johnson
86078aea8c Normalize release notes with develop branch 2014-10-22 14:42:37 -05:00
Nicole Thomas
72537f0ee4 Merge pull request #16813 from holmboe/v2014.1.13-relnotes-in-develop 
Point to the correct latest 2014.1.13 release
 2014-10-22 10:16:53 -06:00
Henrik Holmboe
5d7184491f Document assigned codenames 2014-10-22 17:20:40 +02:00
Henrik Holmboe
20ee003c5f Point to the correct latest 2014.1.13 release 
This is recurring and #12720 is tracking the issue.
 2014-10-22 16:12:48 +02:00
rallytime
1ed3d1827e Release notes for 2014.1.13 2014-10-22 16:12:03 +02:00
Henrik Holmboe
d4258e9040 Point to the correct latest release 
This is recurring and #12720 is tracking the issue.
 2014-10-22 15:56:00 +02:00
Thomas S Hatch
9992edfdca Merge branch '2014.7' into develop 
Conflicts:
	salt/loader.py
 2014-10-20 15:52:31 -06:00
Erik Johnson
af25ad1019 Improvements to releases page 
This clarifies what the current stable release is. It also hides the
2014.7.0 release notes until we actually release that version.
 2014-10-20 14:11:51 -05:00
Pedro Algarvio
229eb00e8d Merge branch '2014.7' forward into develop 
Conflicts fixed.

Conflicts:
	salt/loader.py
	salt/returners/carbon_return.py
	salt/returners/couchbase_return.py
	salt/returners/couchdb_return.py
	salt/returners/elasticsearch_return.py
	salt/returners/local_cache.py
	salt/returners/memcache_return.py
	salt/returners/mongo_future_return.py
	salt/returners/mongo_return.py
	salt/returners/mysql.py
	salt/returners/odbc.py
	salt/returners/postgres.py
	salt/returners/redis_return.py
	salt/returners/smtp_return.py
	salt/returners/sqlite3_return.py
	salt/states/dockerio.py
	salt/utils/minions.py
 2014-10-19 18:21:19 +01:00
Thomas S Hatch
2e9b63ed31 Add notes on cp module and -W/w 2014-10-18 09:24:31 -06:00
Erik Johnson
48e81ac32d Add new fileserver features to helium release notes 
Also made some formatting fixes
 2014-10-15 22:44:43 -05:00
Thomas S Hatch
1468c26ec1 Merge branch '2014.7' into develop 
Conflicts:
	doc/faq.rst
	doc/ref/configuration/minion.rst
	salt/minion.py
	salt/states/pkg.py
	salt/transport/__init__.py
 2014-10-13 15:03:33 -06:00
Thomas S Hatch
fecb0dfebb Merge pull request #16497 from thatch45/notes_2014.7 
Add some release notes updates
 2014-10-08 17:30:43 -06:00
Thomas S Hatch
678a551783 Add soem release notes updates 2014-10-08 16:40:34 -06:00
Colton Myers
710795b3b3 Merge pull request #16492 from saltstack/2014.7 
Merge forward 2014.7 into develop
 2014-10-08 15:25:56 -06:00
Colton Myers
5e25de90e9 Add 2014.1.12 release notes 2014-10-08 15:22:33 -06:00