5822 Commits

Author	SHA1	Message	Date
rallytime	f31f26b5ed	Change some config defaults in the Carbon release	2016-04-06 15:38:51 -06:00
rallytime	eb6773823b	Merge branch '2016.3' into 'develop' ... Conflicts: - salt/modules/rh_service.py	2016-04-01 10:33:44 -06:00
Andreas Lutro	1d50edd8e9	add versionadded	2016-04-01 18:18:54 +02:00
Andreas Lutro	7e620d5ee1	add documentation for --batch-wait	2016-03-31 19:58:11 +02:00
C. R. Oldham	7abf8becaa	Documentation updates that go with PR #32252.	2016-03-31 10:41:24 -06:00
rallytime	fa5e17b342	Merge branch '2015.8' into '2016.3' ... Conflicts: - salt/modules/win_service.py - salt/modules/zypper.py - salt/states/pkgrepo.py	2016-03-30 15:33:13 -06:00
Jacob Hammons	50d1df2482	Fixes windows download paths to account for patch	2016-03-30 14:26:03 -06:00
Borys Pierov	4553cb8ff3	Feature: sdb.delete ... Adds sdb.delete operation support to execution modules, runners and utils. Docs updated as well.	2016-03-30 13:01:37 -04:00
jacobhammons	bf59f06733	Merge pull request #32217 from jacobhammons/dot8 ... 2015.8.8.2 release notes	2016-03-29 11:53:22 -06:00
David Boucha	b48d0c6b5b	Fix spelling error	2016-03-29 11:16:18 -06:00
Nicole Thomas	ab8b70d985	Merge pull request #32212 from rallytime/bp-32197 ... Back-port #32197 to 2015.8	2016-03-29 09:50:58 -06:00
Nicole Thomas	200d82cc3e	Merge pull request #32211 from rallytime/bp-32210 ... Back-port #32210 to 2015.8	2016-03-29 09:50:42 -06:00
Todd Wells	5fdd81ace9	documentation fix issue 31844	2016-03-29 09:11:29 -06:00
Nicole Thomas	dbb95381fb	Merge pull request #32210 from rallytime/merge-32193 ... Merge #32193 with pylint fix	2016-03-29 09:10:36 -06:00
Todd Wells	abd432746c	documentation-fix-31931	2016-03-29 09:08:58 -06:00
Jacob Hammons	596444e2b4	2015.8.8.2 release notes ... Adds banner notifiying user when they are viewing release notes for an old release	2016-03-29 06:38:04 -06:00
Todd Wells	d53c10fa72	documentation fix issue 31844	2016-03-28 16:16:04 -07:00
Todd Wells	bfded5c401	documentation-fix-31931	2016-03-28 15:08:44 -07:00
rallytime	40d09c822e	Add some "best practices" information to test documentation ... Also clarifies some sections and fixes some broken links.	2016-03-28 14:23:42 -06:00
rallytime	d684d49490	Merge branch '2016.3' into 'develop' ... Conflicts: - doc/topics/releases/2015.5.10.rst - doc/topics/releases/2015.8.8.rst	2016-03-28 11:16:22 -06:00
rallytime	9adc2facb2	Merge branch '2015.8' into '2016.3' ... No conflicts.	2016-03-28 10:57:25 -06:00
Mike Place	63c8bf3542	Merge pull request #32160 from cachedout/issue_31944 ... Fix beacon tutorial docs	2016-03-25 16:32:51 -06:00
Mike Place	104ada5b6f	Fix beacon tutorial docs ... Closes #31944	2016-03-25 16:31:39 -06:00
rallytime	f6d9cdc633	Merge branch '2015.8' into '2016.3' ... Conflicts: - doc/ref/states/compiler_ordering.rst - doc/topics/installation/suse.rst - doc/topics/jobs/schedule.rst - doc/topics/targeting/grains.rst - doc/topics/tutorials/preseed_key.rst - doc/topics/tutorials/states_pt5.rst - pkg/suse/use-forking-daemon.patch - salt/minion.py - salt/modules/pacman.py - salt/modules/state.py - salt/modules/yumpkg.py	2016-03-25 11:47:16 -06:00
Mike Place	a09aa18036	Merge pull request #32127 from rallytime/dunder-docs ... Add runners to __salt__ docs	2016-03-25 09:54:02 -06:00
rallytime	482690ef33	Add note to docs about __salt__ referencing runner modules	2016-03-24 16:35:50 -06:00
rallytime	7554d0f42d	Merge branch '2015.5' into '2015.8' ... Conflicts: - doc/ref/states/include.rst - doc/topics/cloud/reactor.rst - doc/topics/reactor/index.rst - doc/topics/releases/2015.5.10.rst - doc/topics/tutorials/states_pt5.rst - doc/topics/windows/windows-package-manager.rst - salt/config.py - salt/modules/state.py - salt/states/grains.py - tests/integration/modules/sysmod.py - tests/unit/states/grains_test.py	2016-03-24 15:48:00 -06:00
Jacob Hammons	21eee08842	Added known issues 32004 and 32044 to 2015.8.8 release notes	2016-03-24 13:58:21 -06:00
rallytime	a11d2e413a	Add runners to __salt__ docs	2016-03-24 12:25:45 -06:00
Nicole Thomas	c03e8757e3	Merge pull request #32107 from rallytime/merge-develop ... [develop] Merge forward from 2016.3 to develop	2016-03-24 11:14:39 -06:00
Mircea Ulinic	7443c0ef0a	Tiny doc fix	2016-03-24 11:14:01 +00:00
rallytime	a333210a08	Merge branch '2016.3' into 'develop' ... Conflicts: - doc/conf.py - salt/modules/rabbitmq.py - salt/states/rabbitmq_user.py - tests/unit/states/rabbitmq_user_test.py	2016-03-23 16:10:31 -06:00
Nicole Thomas	848ce5647f	Merge pull request #32096 from rallytime/bp-32065 ... Back-port #32065 to 2015.5	2016-03-23 16:01:36 -06:00
Nicole Thomas	d5bb8f6372	Merge pull request #32098 from rallytime/bp-32083 ... Back-port #32083 to 2015.8	2016-03-23 15:49:01 -06:00
jacobhammons	9b332d48b9	Merge pull request #32104 from jacobhammons/dot10 ... One additional known issue for 2015.5.10 release notes	2016-03-23 15:20:49 -06:00
Jacob Hammons	b9fc882a1e	One additional known issue for 2015.5.10 release notes	2016-03-23 15:19:36 -06:00
jacobhammons	518167b41b	Merge pull request #32101 from jacobhammons/releases ... Release docs for 2015.8.8 and 2015.5.10	2016-03-23 14:09:13 -06:00
Jacob Hammons	487edb1924	Release docs for 2015.8.8 and 2015.5.10	2016-03-23 14:08:36 -06:00
jacobhammons	ff51d548e1	Merge pull request #32100 from jacobhammons/dot10 ... 2015.5.10 release docs	2016-03-23 14:05:21 -06:00
Jacob Hammons	544a1661ce	2015.5.10 release docs	2016-03-23 14:04:29 -06:00
Jacob Hammons	8ec5d989ad	2015.8.8 release docs	2016-03-23 14:00:30 -06:00
Thomas Güttler	4a3a6629ce	"Fire Event Notifications" moved down ... it is less important. "Requisites" is what the page is about.	2016-03-23 13:57:45 -06:00
TheNullByte	36a9d6a374	Fix an issue with the minion targeting example ... There wasn't the grain selector during the targeting, so the example actually never targets any minions.	2016-03-23 13:56:17 -06:00
Nicole Thomas	f3872c3da3	Merge pull request #32090 from rallytime/merge-develop ... [develop] Merge forward from 2016.3 to develop	2016-03-23 13:51:57 -06:00
Mike Place	7da969aa29	Merge pull request #32060 from guettli/patch-1 ... removed "all": pillar is about "particular minion"	2016-03-23 11:19:44 -06:00
rallytime	55544a84a1	Merge branch '2016.3' into 'develop' ... Conflicts: - salt/minion.py	2016-03-23 11:04:42 -06:00
rallytime	fa09de7a58	Merge branch '2015.8' into '2016.3' ... Conflicts: - tests/unit/states/rabbitmq_user_test.py	2016-03-23 10:56:25 -06:00
C. R. Oldham	0fd625785c	Merge pull request #32055 from mirceaulinic/CF-NTP-STATE ... netntp state: manage NTP peers on network devices	2016-03-23 10:45:13 -06:00
Thomas Güttler	9bd14c1d3d	"Fire Event Notifications" moved down ... it is less important. "Requisites" is what the page is about.	2016-03-23 17:15:29 +01:00
Nicole Thomas	fc1ba937aa	Merge pull request #32065 from TheNullByte/patch-1 ... Fix an issue with the minion targeting example in docs	2016-03-23 09:51:27 -06:00