Commit Graph

1995 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
Thayne Harbaugh
11c0999c66 Add a note to formulas documentation describing yaml_dquote filter. 2014-11-04 12:54:16 -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
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
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
Chris Rebert
d37690e156 fix typos: retreived [sic] 2014-10-27 16:13:46 -07:00