valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
44,328 Commits 24 Branches 182 Tags 341 MiB
88fb2e0036
Commit Graph

3862 Commits

Author SHA1 Message Date
Thomas S Hatch
abc6859e09 Merge pull request #18622 from Supermathie/develop 
alternative way of restarting windows minion
 2014-12-02 10:05:16 -07:00
Thomas S Hatch
dbcc98e5ba Merge pull request #18610 from rallytime/update_zmq4_docs 
Make ZMQ 4 installation docs for ubuntu more clear
 2014-12-02 10:04:16 -07:00
Daniel Nägele
81164c17e7 document the dependencies for the schedule options 'when' and 'range' 2014-12-02 13:33:50 +01:00
Colton Myers
fcc2196a5f Merge branch '2014.7' into merge-forward 
Conflicts:
	salt/cloud/__init__.py
	salt/modules/boto_secgroup.py
	salt/modules/boto_vpc.py
	salt/modules/file.py
	salt/modules/zcbuildout.py
	salt/runner.py
	salt/runners/lxc.py
	salt/runners/manage.py
	salt/utils/schedule.py
	tests/unit/modules/boto_vpc_test.py
	tests/unit/modules/hashutil_test.py
	tests/unit/templates/jinja_test.py
 2014-12-01 15:04:03 -07:00
Michael Brown
9b39eae40c alternative way of restarting windows minion 2014-12-01 16:51:58 -05:00
Tim O'Guin
39fb372898 fixed allocate_new_eip typo in AWS cloud docs 2014-12-01 14:46:32 -06:00
rallytime
9fe67a34c2 Make ZMQ 4 installation docs for ubuntu more clear 
References #18476
 2014-12-01 11:48:17 -07:00
Elias Probst
6a7662c498 Fix typo (agregate → aggregate). 2014-11-29 15:58:07 +01:00
Erik Johnson
b11542dab9 Update 2014.7.1 release notes 2014-11-28 16:55:49 -06:00
T.J. Yang
3f1a007318 shifting chapters in contents 1-3 rst files 2014-11-27 04:15:38 -06:00
T.J. Yang
f024e34e3a without this patch,salt-[1-3].pdf content are wrong 2014-11-27 03:50:17 -06:00
Mike Place
8297c2c48e Documentation 2014-11-26 16:56:45 -07:00
Seth House
75ef72b7fb Merge pull request #18523 from saltstack/revert-18148-six_docs_build 
Revert "[don't merge!!] Add six dependency notice to building docs intru...
 2014-11-26 16:19:42 -07:00
T.J. Yang
a6535cf37d makefile update at Wed Nov 26 16:21:18 CST 2014 2014-11-26 16:21:18 -06:00
Pedro Algarvio
f5794f837c Update 'doc/.tx/config' - Build #213 
http://cookingwithsalt.org/job/salt/job/transifex/213/

Signed-off-by: Pedro Algarvio <pedro@algarvio.me>
 2014-11-26 20:01:25 +00:00
Nicole Thomas
e1157d13be Revert "[don't merge!!] Add six dependency notice to building docs intructions" 2014-11-26 12:23:13 -07:00
Thomas S Hatch
2e3089410a Merge pull request #18514 from cachedout/issue_16879 
Update docs for unless
 2014-11-26 09:29:24 -07:00
Thomas S Hatch
6aa5b0f858 Merge branch '2014.7' into develop 
Conflicts:
	salt/modules/genesis.py
	salt/modules/parted.py
	salt/modules/win_service.py
	salt/runner.py
	salt/states/file.py
	tests/integration/netapi/rest_tornado/test_app.py
 2014-11-26 09:24:24 -07:00
Mike Place
988b8e621d Update docs for unless 
Note that unless is run for each associate state dec.
 2014-11-26 09:17:14 -07:00
Colton Myers
397d61b1fc Add lithium release notes 2014-11-25 15:25:46 -07:00
rallytime
73f3c0091d Clean up doc build so it doesn't stacktrace 
Fixes #18471

- Add zmq.eventloop to mocked modules in doc/conf.py
- Cleaned up rst references in rest_tornado.rst
 2014-11-25 15:11:15 -07:00
Nitin Madhok
93700aa642 Fixing sphinx errors and violations 2014-11-25 15:01:30 -05:00
Thomas S Hatch
389aae80b9 Merge pull request #18448 from fabaff/doc-firewall 
add section about fedora 18+ and rhel/centos 7
 2014-11-25 09:34:04 -07:00
Konrad Starzyk
0759323c99 Merge remote-tracking branch 'upstream/develop' into jboss7 2014-11-25 11:52:27 +01:00
Fabian Affolter
d5caef6666 add section about fedora 18+ and rhel/centos 7 2014-11-24 23:56:28 +01:00
Colton Myers
754baafcf7 Merge branch '2014.7' into develop 2014-11-24 14:38:46 -07:00
Colton Myers
42223567b8 Add warning to docs about topfile compilation 
Ref #12483
 2014-11-24 14:33:37 -07:00
Thomas S Hatch
330771940f Merge pull request #18394 from s0undt3ch/hotfix/merge-forward 
Merge branch '2014.7' forward into develop
 2014-11-24 11:23:07 -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
Pedro Algarvio
0b946ba32b Merge branch '2014.7' into hotfix/merge-forward 2014-11-22 02:17:10 +00:00
T.J. Yang
5f3cf20ffc makefile update at Fri Nov 21 17:12:48 CST 2014 2014-11-21 17:12:48 -06:00
rallytime
91538d7ec1 Add information about salt-cloud events to master events doc 2014-11-21 15:57:59 -07:00
Konrad Starzyk
6656837ff0 Merge remote-tracking branch 'upstream/develop' into jboss7 2014-11-21 21:52:46 +01: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
T.J. Yang
ab842e1163 makefile update at Thu Nov 20 16:45:44 CST 2014 2014-11-20 16:45:44 -06:00
T.J. Yang
7e1a399abd makefile update at Thu Nov 20 16:20:34 CST 2014 2014-11-20 16:20:34 -06:00
T.J. Yang
7497336a68 makefile update at Thu Nov 20 15:36:43 CST 2014 2014-11-20 15:36:43 -06:00
T.J. Yang
10b8b45b52 makefile update at Thu Nov 20 15:24:02 CST 2014 2014-11-20 15:24:02 -06:00
Seth House
898f1a70c3 Fix missing space after colon in architecture doc 
Fixes #18134
 2014-11-20 12:30:33 -06:00
Ronan Amicel
3d2b44a14b Fix typo in 2014.7.0 release notes 
virturalenv → virtualenv
 2014-11-20 11:26:01 +01:00
Konrad Starzyk
99406c2215 Merge remote-tracking branch 'upstream/develop' into jboss7 2014-11-20 11:20:41 +01:00
starzyk1
8101b2a8e7 Documentation fixes for jboss7 and artifactory states/modules 2014-11-20 11:16:57 +01:00
pengyao
3ffa0dfc6b Url should be '/keys' 2014-11-20 11:16:58 +08:00
Elias Probst
b0ead3f326 Typo in 2014.7.0 release notes (documentaiton → documentation). 2014-11-19 20:47:18 +01:00
Thomas S Hatch
aad41a4c4f Merge pull request #18270 from jmdcal/develop 
fixed confusion
 2014-11-19 12:35:51 -07:00
Colton Myers
c5dbb60403 Release 2014.7.0 2014-11-19 11:36:21 -07:00
jmdcal
5e2bbe363a fixed confusion 
Here it says clearly : http://salt-cloud.readthedocs.org/en/latest/topics/aws.html

EC2 instances can have a public or private IP, or both. When an instance is deployed, Salt Cloud needs to log into it via SSH to run the deploy script. By default, the public IP will be used for this. If the salt-cloud command is run from another EC2 instance, the private IP should be used.

my-ec2-config:
  # Specify whether to use public or private IP for deploy script
  # private_ips or public_ips
  ssh_interface: public_ips
 2014-11-19 12:32:07 -06:00
Thomas S Hatch
9860f189d4 Merge pull request #18247 from terminalmage/docs 
Add note about libssh2 optdepend for ssh access w/libgit2
 2014-11-19 09:40:52 -07:00
Erik Johnson
d2b3da6bd7 Add note about libssh2 optdepend for ssh access w/libgit2 
See https://github.com/saltstack/salt/issues/15424#issuecomment-63493011
 2014-11-18 22:08:29 -06:00
Colton Myers
c505a2d3ff Merge branch '2014.7' into merge-forward 
Conflicts:
	salt/modules/at.py
	salt/modules/makeconf.py
	salt/modules/pacman.py
	salt/modules/yumpkg.py
	salt/modules/zfs.py
 2014-11-18 16:48:47 -07:00
Colton Myers
426c97282e Deprecating for Boron, not Beryllium 2014-11-18 16:39:01 -07:00
Colton Myers
c0f7756153 Reorganize orchestration doc and deprecate overstate runner 2014-11-18 16:31:36 -07:00
Colton Myers
716a7e3331 Merge branch '2014.7' into merge-forward 
Conflicts:
	salt/modules/bsd_shadow.py
	salt/modules/freebsdjail.py
	salt/modules/yumpkg.py
	salt/modules/zfs.py
	salt/modules/zypper.py
	salt/netapi/rest_tornado/saltnado.py
	salt/states/dockerio.py
 2014-11-18 12:46:29 -07:00
Nitin Madhok
3306ac2e21 Including doc in toctree 2014-11-18 03:26:54 -05:00
Nitin Madhok
71d964bccf Removing non existing document 2014-11-18 03:10:59 -05:00
Nitin Madhok
31ffaff1e7 Fixes #18114 2014-11-18 03:06:11 -05:00
Nitin Madhok
5d8ae4e32f Fixing sphinx violations and errors 2014-11-18 02:53:40 -05:00
Thomas S Hatch
10d1d490d4 Merge pull request #18187 from whiteinge/doc-key-events 
Added documentation for key events
 2014-11-17 21:12:39 -07:00
Thomas S Hatch
6d87d65cf4 Merge pull request #18186 from whiteinge/faq-nohup-restart 
Added nohup example to the FAQ about restarting Salt with Salt
 2014-11-17 21:12:33 -07:00
Seth House
3858de8776 Merge pull request #18148 from rallytime/six_docs_build 
[don't merge!!] Add six dependency notice to building docs intructions
 2014-11-17 21:02:33 -06:00
Colton Myers
b2a2facb27 Add one additional folder and clarification to client_acl docs 2014-11-17 14:55:08 -07:00
rallytime
e2c5ae3390 Add six dep notice to building docs instructions in documentation doc 2014-11-17 13:18:38 -07:00
rallytime
4660a04d30 Add six dep to build the docs in hacking doc 2014-11-17 13:17:37 -07:00
Pedro Algarvio
8fda8badbb Revert "Add six to list of mocked modules" 
This reverts commit 6ebf0fd3aa.

We need six installed in order for the docs to build. Six is too magical
to be mocked, at last, for now.
 2014-11-17 16:45:46 +00:00
Thomas S Hatch
ab6c8c4f05 Merge pull request #18056 from jacksontj/saltnado 
Saltnado
 2014-11-17 08:58:39 -07:00
Sławek Ehlert
9e19772bff base arg should be a key (string) of the given dict 2014-11-16 00:05:25 +01:00
Thomas S Hatch
6d38d2db62 Merge branch '2014.7' into develop 
Conflicts:
	salt/utils/__init__.py
 2014-11-14 14:38:55 -07:00
Thomas S Hatch
792358c5e0 Merge pull request #18101 from eliasp/2014.7-doc.topics.mine-mine_functions_example 
Fix YAML syntax in mine_functions example.
 2014-11-14 14:36:48 -07:00
Thomas S Hatch
cfd9352e8b Merge pull request #18076 from UtahDave/develop 
add additional repository command
 2014-11-14 14:24:56 -07:00
Elias Probst
5580c714a5 Fix YAML syntax in mine_functions example. 
The elements provided for a mine_functions definition need to be
either a list or a dict, but not a mix of both.
 2014-11-14 21:25:30 +01:00
rallytime
6ebf0fd3aa Add six to list of mocked modules 2014-11-14 11:35:24 -07:00
Seth House
0a55e39683 Added documentation for key events 2014-11-14 13:07:34 -05:00
Erik Johnson
6902e829dd Add warning on RHEL ZMQ4 docs regarding python-hashlib 2014-11-14 11:51:42 -06:00
Seth House
daf0fe9937 Added nohup example to the FAQ about restarting Salt with Salt 
Suggested by @ in #7997.
 2014-11-14 12:40:18 -05:00
David Boucha
0e25bc4955 add additional repository command 
Is Canonical trying to make it harder and harder to find this?
 2014-11-13 17:13:50 -07:00
Colton Myers
9a89057f83 Merge branch '2014.7' into merge-forward 
Conflicts:
	salt/transport/__init__.py
 2014-11-13 12:40:24 -07:00
Thomas Jackson
6d2fbc8715 Documentation for saltnado 2014-11-13 08:36:29 -08:00
Justin Findlay
9158661205 expand unittest docs: formal style, more examples 2014-11-12 16:55:50 -07:00
Justin Findlay
217217f624 wrap unittest doc at 80 chars 2014-11-12 15:59:35 -07:00
rallytime
07e8c393ed Fix spelling in raet doc 2014-11-12 06:50:38 -07:00
Chris Martin
d03a2bf753 Remove an awkward comma splice in the docs. 2014-11-10 20:02:02 -08: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
257b3d4426 Merge branch '2014.7' into merge-forward 
Conflicts:
	salt/utils/__init__.py
	salt/utils/minions.py
 2014-11-10 14:08:49 -07:00
Mike Place
1fd9983fc7 Merge pull request #17310 from rallytime/update_windows_pkg_doc 
Add 2014.7.0 release to windows installation doc
 2014-11-10 12:33:00 -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
Thomas S Hatch
8862c2e829 Merge pull request #17290 from plastikos/improvement-yaml_encode 
Add yaml_encode() jinja filter
 2014-11-10 09:35:39 -07:00
Thayne Harbaugh
e4488a3956 Add yaml_encode() jinja filter 
* Add documentation for yaml_encode()
  * Mention yaml_encode() in formulas documentation
  * Add unit tests for yaml_encode()
  * Improve unit tests and documentation for related yaml_dquote()
 2014-11-07 19:12:58 -07:00
rallytime
4cbeebd3d0 Add 2014.7.0 release to windows installation doc 2014-11-07 15:26:28 -07:00
Pedro Algarvio
4235d15184 Merge branch '2014.7' into develop 2014-11-07 21:47:49 +00:00
rallytime
2396392449 Remove release candidate message from docs sidebar 2014-11-07 09:37:09 -07:00
Thomas S Hatch
e9cda43070 Merge pull request #17240 from mgwilliams/ext_processes 
Ext processes
 2014-11-06 16:46:15 -07:00
Matthew Williams
b753db48b0 add docs for ext_processes 2014-11-06 23:32:36 +00:00
Thomas S Hatch
01b917fcf6 Merge branch '2014.7' into develop 
Conflicts:
	doc/topics/installation/windows.rst
	salt/states/rabbitmq_cluster.py
 2014-11-06 15:04:40 -07:00
Thomas S Hatch
124fbba226 Merge pull request #17216 from rallytime/update_windows_links 
Update windows installer links to include 2014.1.13 pkgs
 2014-11-06 14:33:55 -07:00
Ignacio Torres Masdeu
5977ac4abf Explicitly explain homebrew's stance on sudo 2014-11-06 16:37:38 +01:00
Ignacio Torres Masdeu
6c8ad36c96 Homebrew explicitly discourages the use of sudo 
https://github.com/Homebrew/homebrew/blob/master/share/doc/homebrew/FAQ.md#sudo
 2014-11-06 16:10:32 +01:00
rallytime
6f10b96f01 Update windows installer links to include 2014.1.13 pkgs 2014-11-05 16:15:07 -07:00
Sandra Kosmalla
2096f2cafd fix syntax error in writing grains code snippet 2014-11-05 15:13:51 -07:00
Dylan Fitzgerald
611baf468a Correct data in /srv/reactor/startup_highstate.sls 
data['id'] does not exist; data['name'] does. revise example sls to render correctly.
 2014-11-05 13:23:43 -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
Sandra Kosmalla
de5baa14a2 fix syntax error in writing grains code snippet 2014-11-05 11:33:14 +01:00
Thomas S Hatch
23d58132eb Merge branch '2014.7' into develop 2014-11-04 15:33:56 -07:00
Thomas S Hatch
b3d2edc9a5 Merge branch '2014.7' into develop 2014-11-04 15:11:23 -07:00
Pedro Algarvio
a114dab27d Update 'doc/.tx/config' - Build #196 
http://cookingwithsalt.org/job/salt/job/transifex/196/

Signed-off-by: Pedro Algarvio <pedro@algarvio.me>
 2014-11-04 21:51:34 +00:00
Thomas S Hatch
608d053844 Merge pull request #17121 from plastikos/improvement-yaml_quote 
Add yaml_dquote() and yaml_squote() utilites; load them as Jinja filters...
 2014-11-04 14:02:05 -07:00
Thayne Harbaugh
11c0999c66 Add a note to formulas documentation describing yaml_dquote filter. 2014-11-04 12:54:16 -07:00
Colton Myers
df0547969f We evaluate a prereq, we don't call it. Fixes #17086 2014-11-04 11:36:30 -07:00
Thomas S Hatch
e0904c5b17 Merge pull request #17114 from holmboe/man-clarify 
Some clarifications mainly in the Salt man page
 2014-11-03 21:02:33 -07:00
Thomas S Hatch
bc7217c331 Add comment to clarify confusion in faqs 2014-11-03 20:24:44 -07:00
Colton Myers
dd67f54abe Merge branch '2014.7' into develop 
Conflicts:
	setup.py
 2014-11-03 16:42:29 -07:00
Henrik Holmboe
1f3ba9ced5 Add possible values to arguments in Salt man-page 2014-11-03 21:27:14 +01:00
Henrik Holmboe
d3da8549a2 Typo jod -> job 2014-11-03 21:26:28 +01:00
Henrik Holmboe
878a227837 Choose vs chose typo 2014-11-03 20:54:39 +01:00
Erik Johnson
dfc10ef9b6 Update RC version in docs sidebar 2014-10-31 19:34:03 -06: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
Thomas S Hatch
3f58d716a2 Merge pull request #16878 from plastikos/improvement-filter_by 
Improve filter_by() base argument:
 2014-10-30 10:02:32 -06:00
Hung Nguyen Viet
7423369c55 use 2 spaces only 2014-10-30 11:53:18 +07:00
Seth House
53dae1b3e4 Merge pull request #17019 from whiteinge/doc-salt-api-2014.7-release-notes 
Added the salt-api merge and recent additions to 2014.7 release notes
 2014-10-29 18:16:16 -05: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
Nicole Thomas
500afb29fe Merge pull request #16962 from jacksontj/2014.7 
2014.7
 2014-10-29 16:19:03 -06:00
Seth House
aff7ab3f43 Merge remote-tracking branch 'upstream/2014.7' into develop 2014-10-29 16:47:23 -05:00
Seth House
9da07584e4 Added missing docs for the /key rest_cherrypy entry point 
Should have been part of #16706.
 2014-10-29 16:35:04 -05:00
vs
7d84f116e3 fix formatting 2014-10-29 14:37:18 +01:00
vs
4beb56bdbb add wheel.minions to wheel-index 2014-10-29 14:35:13 +01:00
vs
9e63712488 add documentation for wheel.minions 2014-10-29 14:18:23 +01:00
Henrik Holmboe
3f669c4b5d Update index.rst 2014-10-28 18:36:19 +01:00
Thomas Jackson
9f7dac0674 Spelling fixes for docs 2014-10-28 08:12:27 -07:00
Seth House
c258d7d75f Highlight our remote training offerings 2014-10-28 08:42:08 -05:00
Mike Place
b3920023e7 Merge pull request #16943 from hulu/retreived-sic 
fix typos: retreived [sic]
 2014-10-27 19:12:57 -06:00
Chris Rebert
d37690e156 fix typos: retreived [sic] 2014-10-27 16:13:46 -07:00
Colton Myers
945e6506b6 Merge branch '2014.7' into develop 2014-10-27 15:32:25 -06:00
Colton Myers
6da0967805 Fix pre-required vs pre-requiring mixups in prereq doc 2014-10-27 10:59:07 -06:00
nerdling
4d02c8da81 Update doc/topics/installation/osx.rst 
Unify instructions across package managers.
 2014-10-26 16:20:13 -04:00
Erik Johnson
142bac1522 Update release candidate number in docs sidebar 2014-10-25 17:56:28 -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
0e772aefe7 Update conf.py as well 2014-10-24 16:27:37 -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
Erik Johnson
706f53941b Add notice on automatic installation of repoquery 2014-10-24 16:15:48 -05:00
Thayne Harbaugh
65e477dd67 Improve filter_by() base argument: 
* Change filter_by() base argument to a key in lookup_dict rather
    than a dictionary.  This allows more compact usage and more
    readable use of base values/defaults in the lookup_dict.

  * Change/improve function-local documentation for lookup_dict().

  * Add specific use-case of "base" argument for lookup_dict() in the
    formulas documentation.

  * Expand filter_by() unit testing to validate use of base argument.

  * Add unit test for salt.utils.dictupdate.update() to provide
    complete depth-of-testing of filter_by() which uses
    dictupdate.update().
 2014-10-24 11:13:47 -06: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
Thomas S Hatch
910991a468 update raet intro 2014-10-23 18:15:24 -06:00
Thomas S Hatch
37d90fc633 Merge pull request #16853 from cachedout/issue_14906 
Add master_alive_interval to config and docs
 2014-10-23 15:14:44 -06:00