valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
42,099 Commits 24 Branches 182 Tags 341 MiB
d2b3da6bd7
Commit Graph

1995 Commits

Author SHA1 Message Date
Joseph Hall
9466dba1ce Merge pull request #15835 from wesleylancel/digital-ocean-api-v2 
Add support for Digital Ocean's API v2
 2014-09-17 14:07:29 -06:00
Erik Johnson
111a09f2ad Merge remote-tracking branch 'upstream/2014.7' into develop 
Conflicts:
	salt/minion.py
	salt/output/nested.py
 2014-09-16 18:46:48 -05:00
Thomas S Hatch
a12a4af12e Merge pull request #15834 from nmadhok/doc-fix 
Doc fixes
 2014-09-16 09:59:47 -06:00
Thomas S Hatch
3cb1c6bca9 Merge pull request #15824 from hvnsweeting/develop 
remove duplicate entry, it was in advanced topics
 2014-09-16 09:59:28 -06:00
Wesley Lancel
407e48ae35 Add support for Digital Ocean's API v2 2014-09-16 17:16:14 +02:00
Nitin Madhok
6acc5d5198 More 2014-09-16 10:01:50 -04:00
Nitin Madhok
72f3bf8c53 More doc fixes 2014-09-16 09:59:01 -04:00
Hung Nguyen Viet
d47b8be40f remove duplicate entry, it was in advanced topics 2014-09-16 14:16:17 +07:00
rallytime
3e488df321 Cleanup azure docs 2014-09-15 15:50:43 -06:00
Mike Place
8255451803 Add docs about auth retry options 2014-09-15 12:40:43 -06:00
Colton Myers
8d0bf0ee95 Merge branch '2014.7' into develop 
Conflicts:
	salt/states/pip_state.py
 2014-09-15 11:49:04 -06:00
Colton Myers
3da7fa06d9 Update release candidate docs with newest rc number 2014-09-15 11:45:56 -06:00
Nitin Madhok
b7d5b2cde2 Fixing sphinx violations and errors 2014-09-12 13:28:01 -04:00
Mike Place
f7d89816b1 Job flow doc 2014-09-12 11:01:30 -06:00
Thomas S Hatch
d6e3e01c6d Merge pull request #15392 from ihrwein/f/add-syslog-ng-modules 
F/add syslog ng modules
 2014-09-12 10:37:02 -06:00
Frank Klaassen
22b4a88688 Tweak releasenotes 2014-09-12 14:49:18 +02:00
Valentin Bud
d0e962c832 Use custom returner from a reactor. 2014-09-10 10:00:06 +03:00
Colton Myers
0da0efff17 Merge branch '2014.7' into develop 
Conflicts:
	salt/utils/cloud.py
 2014-09-09 15:22:29 -06:00
Colton Myers
6e67d37d30 Add v2014.1.11 release notes 2014-09-09 15:04:33 -06:00
Nitin Madhok
773ccadeff Update formulas.rst code blocks 2014-09-05 16:34:24 -04:00
Thomas S Hatch
e34e81f41b Merge branch '2014.7' into develop 
Conflicts:
	salt/minion.py
 2014-09-05 11:03:12 -06:00
Thomas S Hatch
abc1c037ac Merge pull request #15522 from rallytime/multimaster_docs 
Update multimaster tutorial
 2014-09-04 14:11:52 -06:00
Joseph Hall
f4a9e4df07 Merge pull request #15524 from hulu/typos 
fix typos in doc/topics/jobs/job_cache.rst
 2014-09-04 14:00:46 -06:00
Colton Myers
57e187d46f Merge branch '2014.7' into develop 
Conflicts:
	salt/modules/mount.py
 2014-09-04 13:45:03 -06:00
Chris Rebert
3053248b67 fix typos in doc/topics/jobs/job_cache.rst 2014-09-04 12:16:45 -07:00
rallytime
e5a1876462 Update multimaster tutorial 2014-09-04 12:58:19 -06:00
Thomas S Hatch
04c1822038 Merge pull request #15497 from basepi/bp-15410 
Backport #15410 to 2014.7
 2014-09-04 11:06:54 -06:00
Henrik Holmboe
c43a99242c Minor doc change 2014-09-04 17:27:02 +02:00
rallytime
86be50c876 Add libcloud dependency notice to provider docs 2014-09-03 20:10:51 -06:00
David Boucha
a2cc5cbaaa fix grammar 2014-09-03 16:40:05 -06:00
David Boucha
bc7b3289e8 fix some misspellings and grammar 2014-09-03 16:40:05 -06:00
Nitin Madhok
ef05362c6c Fixing more sphinx errors and violations 2014-09-03 16:05:36 -06:00
Nitin Madhok
6ce392b236 More sphinx errors and violations 2014-09-03 16:05:07 -06:00
Thomas S Hatch
53855f7886 Add doc on job cache 2014-09-03 15:36:48 -06:00
Thomas S Hatch
2f6ae96f37 Merge branch '2014.7' into develop 
Conflicts:
	salt/client/ssh/__init__.py
 2014-09-03 14:43:07 -06:00
Erik Johnson
3c800cdd5f Add pygit2 install link to gitfs walkthrough 2014-09-02 23:33:11 -05:00
Thomas S Hatch
1d85209c7f Merge pull request #15456 from cachedout/eauth_clarify 
Clarify a point about runners and eauth
 2014-09-02 17:33:48 -06:00
Colton Myers
4214f8dc2b Merge branch '2014.7' into develop 
Conflicts:
	salt/utils/network.py
 2014-09-02 16:35:03 -06:00
Mike Place
350b6f853a Typo 2014-09-02 16:19:59 -06:00
Mike Place
3075b1fd33 Clarify a point about runners and eauth 2014-09-02 15:56:25 -06:00
Erik Johnson
510942d3ec Remove references to masterless salt from gitfs docs 
Alternate backends do not yet work with the local fileclient.
 2014-09-02 15:59:05 -05:00
Erik Johnson
9b2fc52e93 Fix duplicate word 2014-09-02 15:31:13 -05:00
Erik Johnson
ac944272e0 Fix spelling error 2014-09-02 15:27:44 -05:00
Mike Place
8c737afa1e Merge branch '2014.7' into develop 
Conflicts:
	salt/utils/cloud.py
 2014-09-02 14:20:04 -06:00
Erik Johnson
ba3e0367c6 Remove extraneous word 2014-09-02 15:16:32 -05:00
Mike Place
be60e25574 Merge branch '2014.7' into develop 2014-09-02 13:56:54 -06:00
Erik Johnson
0a5bc21b58 More gitfs documentation clarifications/corrections 2014-09-02 14:37:52 -05:00
Erik Johnson
0ae4a108b7 Clarify outdated information in gitfs walkthrough 
This paragraph predates the addition of pygit2 and dulwich support, and
seems to suggest that GitPython is required for gitfs, when that is no
longer necessarily true. This commit clarifies the wording here.
 2014-09-02 13:22:56 -05:00
Colton Myers
36ef47e7a2 Merge branch '2014.7' into develop 
Conflicts:
	conf/minion
	salt/modules/mine.py
 2014-09-02 10:43:31 -06:00
Thomas S Hatch
b438e60469 Merge pull request #15339 from whiteinge/doc-back-ports 
Added instructions on how to back-port fixes to release branches
 2014-09-02 08:36:13 -06:00
Joseph Hall
e28468d930 Merge pull request #15342 from fly/li-pubkey 
add support for ssh pubkey deployments using Linode
 2014-09-02 08:30:52 -06:00
Jille Timmermans
4064a8cf4c Fix some documentation inconsistencies 2014-09-02 11:38:23 +02:00
Erik Johnson
892a78ea1c Double-backticks for formatting consistency 2014-09-01 15:07:03 -05:00
Erik Johnson
036e1cbeb7 Merge pull request #15414 from Jille/fix-docs 
Small documentation fix in pillars
 2014-09-01 15:01:27 -05:00
Simon Schmidt
f4c9ec24de Fix saltutil.refresh_pillar reference in Pillar tutorial 
It used to reference `saltutil.pillar_refresh` which gives the error:

    'saltutil.pillar_refresh' is not available.
 2014-09-01 20:38:50 +02:00
Jille Timmermans
30bce1dafa Small documentation fix in pillars 2014-09-01 13:13:12 +02:00
Nitin Madhok
b526ee2aab Fixing more sphinx errors and violations 2014-09-01 02:44:27 -04:00
Nitin Madhok
938d8e90ee More sphinx errors and violations 2014-09-01 02:33:15 -04:00
Joseph Hall
4e29954710 Update Esky docs for clarity, and remove 2nd person 2014-08-30 19:50:32 -06:00
btibi
69b0deacf6 syslog_ng: add syslog-ng state and execution modules 2014-08-29 23:20:25 +02:00
Jon Chen
c3d86fe44c also update other linode config doc 2014-08-27 23:27:52 -04:00
Jon Chen
f29fd0340e s/ssh_private_key/ssh_key_file 2014-08-27 23:25:08 -04:00
Jon Chen
33ddb0d451 document new ssh_private_key config value 2014-08-27 23:13:00 -04:00
Daniel Wallace
14d45a25d2 document ssh_agent 2014-08-27 21:40:05 -05:00
Seth House
47efe38949 Added instructions on how to back-port fixes to release branches 2014-08-27 20:17:12 -06:00
Jon Chen
86a2808b34 document possibility of ssh_pubkey 2014-08-27 20:14:24 -04:00
Robert Fairburn
235695ee19 Specify the version that interface properties were added in doc/topics/cloud/aws.rst 2014-08-27 14:02:01 -06:00
Seth House
e1b39609c5 Merge pull request #15298 from terminalmage/update-release-notes 
Normalize the 2014.7.0 release notes
 2014-08-26 19:04:54 -06:00
Seth House
013453ef1f Merge pull request #15301 from cachedout/pillar_merge 
Docs on merging pillar keys
 2014-08-26 17:18:35 -06:00
Erik Johnson
35c9f40c5d fix bullet list 2014-08-26 17:58:32 -05:00
Erik Johnson
3388256da7 fix bullet list 2014-08-26 17:57:20 -05:00
Erik Johnson
21d16a87fd Normalize the 2014.7.0 release notes 
Some parts of the release notes only existed in develop, some only in
2014.7. This commit normalizes develop's copy, as well as fixing some
formatting issues (chiefly among them replacing the use of markdown with
rST).
 2014-08-26 17:08:19 -05:00
Erik Johnson
4597487f2f Normalize the 2014.7.0 release notes 
Some parts of the release notes only existed in develop, some only in
2014.7. This commit normalizes 2014.7's copy.
 2014-08-26 17:06:14 -05:00
Mike Place
65f232e066 Docs on merging pillar keys 
Refs #14916
 2014-08-26 15:48:51 -06:00
Alex Kelly
1a943480e9 Added some very basic information about actually writing grains in the 
"writiing grains" section
 2014-08-26 16:45:31 -04:00
Colton Myers
62919c096d Merge branch '2014.7' into develop 
Conflicts:
	salt/modules/gem.py
	salt/modules/lxc.py
	salt/states/boto_elb.py
	salt/states/gem.py
	tests/unit/states/gem_test.py
 2014-08-26 13:35:01 -06:00
Thomas S Hatch
e385b15e56 Merge pull request #15273 from rallytime/list_profiles 
Add --list-profiles to salt-cloud query options
 2014-08-26 13:29:05 -06:00
Nitin Madhok
913057254d Fixing typo 2014-08-26 13:30:06 -04:00
Thomas S Hatch
8a34808d18 Merge pull request #15261 from saltstack/bp-15141 
Forward-port #15141 to 2014.7
 2014-08-26 10:18:24 -06:00
Thomas S Hatch
72197e1a3b Merge pull request #15246 from saltstack/bp-14861 
Backport #14861 to 2014.7
 2014-08-26 08:58:18 -06:00
rallytime
0f4f68eddf Add --list-providers and --list-profiles to cloud docs 2014-08-26 00:18:57 -06:00
Gajdos Tamás
d4dbaa77e0 Update documentation on salt-ssh 
User must set NOPASSWD option for a non-root user to use sudo. 
Solves #12808.
 2014-08-25 14:14:05 -06:00
David Boucha
859eaa1468 add example of pillar on the Cli 2014-08-25 14:05:39 -06:00
David Boucha
8da4eb3ab5 fix whitespace issues 2014-08-25 14:01:16 -06:00
David Boucha
c016bf5db2 remove whitespace 2014-08-25 13:59:16 -06:00
Kamal Nasser
c613c08869 Replace all occurrences of "Digital Ocean" with "DigitalOcean" 2014-08-25 13:42:01 -06:00
Colton Myers
ad89a752f8 Merge branch '2014.7' into develop 
Conflicts:
	salt/cloud/__init__.py
	salt/utils/cloud.py
 2014-08-25 13:29:29 -06:00
Nitin Madhok
10ecc9b1c8 Formatting path 2014-08-25 13:49:49 -04:00
Nitin Madhok
0208baa53c Fixing some of the formatting issues 2014-08-25 13:32:15 -04:00
Joseph Hall
0b546aeadd Merge pull request #15234 from cachedout/pillar_refresh_doc 
Add info about pillar refresh.
 2014-08-25 11:12:54 -06:00
Erik Johnson
41a0753518 Add ssh_config example for GitPython 2014-08-25 12:06:29 -05:00
Mike Place
0d03e31fb7 Add info about pillar refresh. 2014-08-25 10:56:55 -06:00
Joseph Hall
53998789d5 Merge pull request #15224 from rallytime/gce_docs 
Update salt-cloud gce docs to use downloaded p12 key file
 2014-08-24 12:19:52 -06:00
rallytime
6d632d8f17 Update salt-cloud gce docs to use downloaded p12 key file 2014-08-24 12:15:04 -06:00
Thomas S Hatch
0c05702184 Merge pull request #15193 from techhat/clouddocs 
Cloud cache is now msgpack, not json
 2014-08-22 14:11:08 -06:00
Joseph Hall
3571d3eb3c Cloud cache is now msgpack, not json 2014-08-22 13:22:25 -06:00
Chris Rebert
a53ae15d23 copyedits 2014-08-22 11:59:13 -07:00
Thomas S Hatch
f0009be6c2 Merge branch '2014.7' into develop 2014-08-21 17:20:26 -06:00
Thomas S Hatch
2d47589c88 Merge pull request #15140 from terminalmage/pygit2-auth 
Add gitfs authentication support for pygit2>=0.20.3
 2014-08-21 15:03:35 -06:00
Seth House
4abc45397d Merge remote-tracking branch 'upstream/2014.7' into develop 2014-08-21 13:23:52 -06:00
Thomas S Hatch
45f447fa84 Merge pull request #15138 from whiteinge/reactor-file_roots 
Add salt:// support to Reactor sls files
 2014-08-21 10:54:43 -06:00
Thomas S Hatch
ef9494536e Merge pull request #15129 from rallytime/schedule_docs 
Fix broken link in schedule docs
 2014-08-21 10:47:21 -06:00
Thomas S Hatch
854bf8aff5 Merge pull request #15126 from notpeter/develop 
Improve 2014.7.0 release notes.
 2014-08-21 10:37:25 -06:00
Erik Johnson
5444c68437 Update docs to reflect pygit2 auth support in 0.20.3 2014-08-20 23:54:48 -05:00
Seth House
c05f250d96 Add salt:// paths for reactor files to the doc examples 2014-08-20 21:14:29 -06:00
Seth House
30e8fb653a Line up comments in reactor example 2014-08-20 21:14:29 -06:00
Seth House
2cd0fa6223 Document that globs can be used in reactor filenames 2014-08-20 21:14:29 -06:00
Erik Johnson
c8be676577 Update gitfs documentation 
This adds all the new authentication options, and also moves most of the
usage examples into the gitfs walkthrough. The walkthrough has also
undergone considerable restructuring.
 2014-08-20 21:36:44 -05:00
rallytime
ded01bfefd Fix broken link in schedule docs 2014-08-20 16:10:03 -06:00
Peter Tripp
49aa196140 Improve 2014.7.0 release notes. 2014-08-20 14:56:58 -07:00
Colton Myers
916141fac0 Merge branch '2014.7' into develop 
Conflicts:
	tests/integration/shell/call.py
 2014-08-20 14:39:31 -06:00
Mike Place
94543fe68d Document seco range 
Per request in #15093
 2014-08-20 11:54:29 -06:00
Mike Place
e2790afe31 Fix broken link 
Closes #15077
 2014-08-19 11:54:16 -06:00
Carl Meyers
7c4ce67d28 Schedule documentation update. 2014-08-18 21:20:54 -07:00
Joseph Hall
bbf0705f36 Merge pull request #15048 from wackycaptain/fix-doc-contributing 
Fix broken links in contributing documentation.
 2014-08-16 17:08:42 -06:00
wackycaptain
1032754af9 Fix broken links in contributing documentation. 2014-08-16 23:27:58 +02:00
Colton Myers
932aa97e1f Merge branch '2014.7' into develop 2014-08-15 16:33:02 -06:00
Thomas S Hatch
b5eb4e1c83 Merge pull request #14974 from whiteinge/doc-names-release-notes 
Add mention of the ``names`` expansion to the 2014.7 release notes
 2014-08-14 23:49:40 -06:00
Thomas S Hatch
2f61f8bedc Merge pull request #14937 from basepi/yamldates14860 
Add additional example for datetime YAML idiosyncrasy
 2014-08-14 23:44:27 -06:00
Colton Myers
0af22fcb19 Merge branch '2014.7' into develop 2014-08-14 17:39:10 -06:00
Colton Myers
8c7d1132c8 Add security advisory to release notes for 2014.1.10 2014-08-14 17:35:27 -06:00
Joseph Hall
725f2d8969 Typo correction 2014-08-14 14:31:25 -06:00
Joseph Hall
130755c0b1 Adding http libraries and modules 2014-08-14 13:33:12 -06:00
Colton Myers
92742f7e08 No second person 2014-08-13 17:33:06 -06:00
Seth House
d6818325c8 Add mention of the `names` expansion to the 2014.7 release notes 
Refs #14971
 2014-08-13 19:01:21 -04:00
Thomas S Hatch
288b57b642 Merge pull request #14950 from gravyboat/develop 
Add versionadd to postgres_extension, update troubleshooting guides to explain timeouts, pull slspath from best_practices
 2014-08-13 16:39:02 -06:00
Forrest
39b4c21c3d Fix a typo in the master conf. 2014-08-13 11:09:05 -07:00
Forrest
5145e3b448 Fix a typo 2014-08-13 11:08:35 -07:00
Colton Myers
fb189dae63 Merge branch '2014.7' into develop 2014-08-13 10:26:20 -06:00
Forrest Alvarez
fec0c4e035 Update best_practices to resolve issue where slspath is used, but not yet implemented/explained. 2014-08-13 04:57:14 +00:00
Forrest Alvarez
c4e55d9b84 Update the master and minion guides to discuss timeout settings. 2014-08-13 04:54:11 +00:00
Colton Myers
ff8d8df1d2 Add additional example for datetime YAML idiosyncrasy 
Fixes #14860
 2014-08-12 16:25:43 -06:00
Colton Myers
788ed4606f Reword some things 2014-08-12 15:08:02 -06:00
Colton Myers
51917ee017 Add installation docs for Salt release candidate 2014-08-12 14:53:21 -06:00
Colton Myers
19cf82fd5f Merge branch '2014.7' into develop 
Conflicts:
	doc/topics/transports/raet/index.rst
	salt/minion.py
 2014-08-12 14:15:50 -06:00
Nitin Madhok
f99dac462b Update formulas.rst 
Fixes https://github.com/saltstack/salt/issues/14900
 2014-08-12 13:18:48 -04:00
Thomas S Hatch
05f4d0f7a8 update raet install docs for 2014.7 2014-08-12 11:16:53 -06:00
Seth House
b5bf67fdd1 Merge branch 'copyediting' of https://github.com/hulu/salt into develop 
Conflicts:
	salt/states/win_update.py
 2014-08-11 18:23:44 -04:00
Seth House
4a72be9d7e Merge pull request #14890 from nmadhok/improve-salt-modules 
Improve Salt Docs
 2014-08-11 16:00:24 -04:00
Chris Rebert
177c168a21 Fix numerous typos found via Lintian 
Thanks https://github.com/Debian/lintian/tree/master/data/spelling !
 2014-08-11 10:46:43 -07:00
Nitin Madhok
41712eab04 Fixing more sphinx warnings and errors 2014-08-11 12:33:55 -04:00
Sylvain Bellemare
9f6ecc4874 Removed duplicate occurrences of the word "the" 2014-08-11 16:05:29 +02:00
Erik Johnson
dcdf114824 Merge branch '2014.7' into develop 2014-08-09 17:12:12 -05:00
Seth House
05022c6adb Documented the mine_function alises 
Closes #14738
 2014-08-09 11:14:25 -06:00
Kamal Nasser
825bb191bf Replace all occurrences of "Digital Ocean" with "DigitalOcean" 2014-08-08 22:16:37 +03:00
Joseph Hall
94f82e0c82 Merge pull request #14849 from 7oku/patch-1 
removed doubled "provider: azure" statement
 2014-08-08 07:25:47 -06:00
7oku
bb7c60fff8 removed doubled "provider: azure" statement 
needed once only
 2014-08-08 14:55:19 +02:00
Sylvain Bellemare
54f97b3b06 Fixed typos 2014-08-08 14:39:28 +02:00
Sylvain Bellemare
8d3dbabb4a Fixed typo 2014-08-08 12:16:47 +02:00
Seth House
8a60ce5351 Merge remote-tracking branch 'upstream/2014.7' into develop 
Conflicts:
	doc/topics/development/conventions/formulas.rst
 2014-08-07 15:51:49 -04:00
Thomas S Hatch
996bae04cd Add clarity note in the docs 2014-08-07 12:08:14 -06:00
Seth House
b656adef77 Fleshed out Formula Parameterization section 2014-08-06 10:51:46 -04:00
Seth House
d3d8c08ddd Removed the redundant platform agnostic Formula section 2014-08-06 10:45:16 -04:00
Seth House
8758b02445 Fleshed out the recommendations for writing reusable formulas 2014-08-06 10:45:16 -04:00
Seth House
b7eb6a5c09 Moved the Formula repository structure docs to the bottom 
We should describe best practices for writing formulas first.
 2014-08-06 10:45:15 -04:00
Seth House
f741aee4a4 Improve and clarify the Formula docs on using formulas from non-formulas 2014-08-06 10:39:48 -04:00
Seth House
3f7118dd8b Improved the Formula installation docs with examples 2014-08-06 10:39:47 -04:00
Seth House
f819a1e85c Improved the simple Formula usage example at the top 2014-08-06 10:39:47 -04:00
Seth House
20dd4b42de Updated the Formula README recommendation 2014-08-06 10:39:47 -04:00
Seth House
1815e24fe9 Improve and shorten the Formula lookup table recommendation 2014-08-06 10:39:41 -04:00
Seth House
b46d087966 Moved the Formula Conventions CHANGELOG section down next to Versioning 
This section is less important for new users than the mapfile and sls
recommendation sections.
 2014-08-06 10:34:42 -04:00
Seth House
93da920147 Removed 0.17 requirement note from formula docs 
0.17 is no longer a supported release.
 2014-08-06 10:34:41 -04:00
Chris Rebert
100d831ca9 copyedit doc/topics/releases/2014.7.0.rst 2014-08-05 18:31:36 -07:00
Colton Myers
f0aba5f9db Merge branch '2014.7' into develop 2014-08-05 16:29:11 -06:00
David Boucha
7e7f07927d add links to 2014.1.10 installers 2014-08-05 16:02:09 -06:00
Colton Myers
13995afba0 Merge branch '2014.7' into develop 
Conflicts:
	doc/topics/releases/2014.7.0.rst
 2014-08-05 15:32:04 -06:00
Thomas S Hatch
0e93ad1f28 Add mod_aggregate to the release docs 2014-08-05 13:26:30 -06:00
Joseph Hall
8a3cb618b2 Merge pull request #14727 from seegno/bugfix/multimaster-doc 
Add missing lines between the code block declaration and the body
 2014-08-04 17:55:00 -06:00
Alfredo Palhares
145670b459 Add missing lines between the code block declaration and the body 2014-08-05 00:40:18 +01:00
Daniel Wallace
45c13d621f document the usage of userdata for cloud-init 
closes #14643
 2014-08-04 11:25:20 -06:00
Thomas S Hatch
1bd88cab28 Merge pull request #14535 from steverweber/template_var 
add two vars to the templates slspath and tplpath
 2014-08-04 10:06:07 -06:00
Daniel Wallace
77eaca180a document the usage of userdata for cloud-init 
closes #14643
 2014-08-03 13:38:38 -05:00
Pedro Algarvio
905b9a18b7 Merge pull request #14686 from whiteinge/test-gh-order 
Couple o' documentation fixes
 2014-08-03 00:48:56 +01:00
Elias Probst
686236d650 Corrected typo (Verion → Version). 2014-08-03 00:46:44 +01:00
Elias Probst
7e5a9a7ed8
Corrected typo (Verion → Version). 2014-08-02 11:04:30 +02:00
Colton Myers
0143275458 Merge branch '2014.7' into develop 2014-08-01 12:36:57 -06:00
Colton Myers
051e371fe8 Add release notes for 2014.1.10 2014-08-01 12:36:10 -06:00
Seth House
ab508cb9d3 Fix maxdepth TOC for Salt at Scale tutorials 2014-08-01 12:05:22 -06:00
Hung Nguyen Viet
415623a9c6 fix link scheme, default scheme is HTTPS, as used sample configs 
provided by the tut
 2014-08-01 15:56:58 +07:00
Evan Borgstrom
c892cfad8a Adding Pyobjects section to the release notes for 2014.7.0 2014-07-31 18:06:05 -05:00
Erik Johnson
b454e39953 Merge pull request #14663 from borgstrom/pyobjects-rel-note 
Adding Pyobjects section to the release notes for 2014.7.0
 2014-07-31 18:02:21 -05:00
Colton Myers
b8b533986a Merge branch '2014.7' into develop 2014-07-31 14:12:44 -06:00
Colton Myers
4e36743523 Add 2014.1.9 release notes 2014-07-31 14:12:25 -06:00
Evan Borgstrom
4a2575806d Adding Pyobjects section to the release notes for 2014.7.0 2014-07-31 10:26:46 -07:00
Colton Myers
9f7f02b3ac Merge branch '2014.7' into develop 2014-07-30 13:48:40 -06:00
Colton Myers
0406655519 Add release notes for 2014.1.8 2014-07-30 13:48:18 -06:00
rallytime
ea4b045944 Update docs for using salt-cloud on OSX to install curl-ca-bundle 2014-07-29 15:29:33 -06:00
Nitin Madhok
4f9349381e Fixing a broken link and formatting code block 2014-07-29 12:03:49 -04:00
steverweber
0b764c5b69 add two vars to the templates slspath and tplpath 2014-07-29 09:53:19 -04:00
Chris Rebert
7c7986f63a spelling fixes in 2014.7.0 release notes 2014-07-25 17:32:23 -07:00
Thomas S Hatch
efe27a50b5 Merge branch '2014.7' into develop 2014-07-23 11:59:27 -06:00
rallytime
aaf85bf4ea Add versionadded to new redis modules 2014-07-23 11:43:37 -06:00
Joseph Hall
f26ee8480b Merge pull request #14414 from gtmanfred/develop 
use sftp to transfer files instead of scp
 2014-07-23 08:12:57 -06:00
Daniel Wallace
53bc8f9c3c document use_sftp 2014-07-22 18:54:48 -05:00
Seth House
94d8fc966e Updated the contributor documentation with the new branching workflow 2014-07-21 20:19:33 -06:00
Erik Johnson
fa24e3c7fe Fix paths in proxyminion example 
Default pillar root is /srv/pillar, not /srv/salt/pillar.
 2014-07-20 18:34:13 -05:00
rallytime
ba17a3d64e Remove CloudConfigMixIn class from salt/utils/parsers (deprecated) 2014-07-17 16:35:25 -06:00
rallytime
c088a44a56 Deprecate libcloud_version from salt/cloud/libcloudfuncs 2014-07-17 16:30:20 -06:00
rallytime
66592887b7 Remove vm_config and vm_config_path from config.cloud_config function 2014-07-17 16:26:49 -06:00
rallytime
81e06fa252 Removed deprecated functions in salt/modules/ps.py 2014-07-16 12:49:45 -06:00