Commit Graph

1542 Commits

Author SHA1 Message Date
rallytime
c482bf2e6c Update "Getting Started with Digital Ocean" docs to include ssh requirements 2014-06-24 14:47:00 -06:00
Daniel Wallace
4d8d2fa377 Document match for overstates
Uses compound matching. Closes #13659
2014-06-23 19:19:47 -05:00
Henrik Holmboe
e0a6a5a13e Reflect the latest released version
I did this exact PR in #12695 the last time around. Luckily #12720 seems to take a stab at automating this. :)
2014-06-23 19:56:39 +02:00
Seth House
d2f82c8bba Removed incorrect TOC syntax from netapi index 2014-06-20 10:21:18 -06:00
Joseph Hall
2fad262ced Merge pull request #13581 from basepi/releasecherrypick
Add some notes about cherry-picking
2014-06-20 06:33:48 -06:00
Colton Myers
df7ef6f504 Fix typo 2014-06-19 16:19:20 -06:00
Colton Myers
a41b4107ea Add some notes about cherry-picking 2014-06-19 16:17:46 -06:00
Seth House
8f5e336a16 Added link to the writing netapi modules doc 2014-06-19 13:22:57 -06:00
Seth House
14f663f37e Added link to legacy salt-api release notes 2014-06-19 13:20:05 -06:00
Seth House
6d09e554e4 Fixed two straggling occurances of APIClient -> NetapiClient 2014-06-19 13:02:16 -06:00
Thomas S Hatch
b6cc31e8af Merge pull request #13554 from whiteinge/saltapi-merge
salt-api merge!
2014-06-19 11:44:52 -06:00
Pedro Algarvio
1a9a7fb87e Merge branch 'develop' of github.com:saltstack/salt into hotfix/saltapi-merge-tests 2014-06-19 12:01:33 +01:00
Ronan Amicel
77dfa9eff4 Docs: fix list formatting on the Installation page 2014-06-19 11:56:28 +02:00
Thomas S Hatch
060f34f746 Merge pull request #13526 from s0undt3ch/hotfix/setup-raet
simpler requirements setup
2014-06-18 23:55:01 -06:00
Nitin Madhok
2e27b9d1df Fixed typo 2014-06-19 01:40:39 -04:00
Seth House
53bab586f4 Merged salt-api into Salt
Woot!

The conflicts below are intentional because they contained salt-api-isms
that needed to be included into the corresponding Salt files.

Conflicts:
	debian/changelog
	debian/control
	doc/conf.py
	doc/index.rst
	opt_requirements.txt
	salt/config.py
	salt/loader.py
2014-06-18 22:13:56 -06:00
Seth House
1d4057fadf Updated all saltapi import paths to salt.netapi 2014-06-18 20:56:16 -06:00
Seth House
6f112d6eef Updated the netapi modules index to be more clear 2014-06-18 20:19:03 -06:00
Seth House
554a612aa4 Renamed netapis to netapi 2014-06-18 20:05:02 -06:00
Seth House
cf4b684edb Moved salt-api release notes into saltapi subdir 2014-06-18 20:03:40 -06:00
Seth House
598a1d74a3 Removed redundant docs files with Salt-core docs 2014-06-18 20:02:16 -06:00
Colton Myers
6cb859b6da Merge pull request #13394 from basepi/2014.1.5release
Add release notes for 2014.1.5 and bump docs version
2014-06-18 10:27:59 -06:00
Thomas S Hatch
7b1950b803 Merge pull request #13468 from techhat/db
Add sdb loader type
2014-06-18 10:04:29 -06:00
Pedro Algarvio
33b1532239 Remove ending install 2014-06-18 00:46:59 +01:00
Pedro Algarvio
acf51004f8 Update documentation accordingly 2014-06-18 00:36:35 +01:00
Erik Johnson
a1f5be53dc Remove pillar page from targeting toctree 2014-06-17 17:23:31 -05:00
Erik Johnson
5688da134d Remove pillar targeting page
There is already a section for this in the Pillar page, no need for a
dedicated page.
2014-06-17 17:21:22 -05:00
Erik Johnson
0f7c91b9e0 Add external ref target for pillar targeting 2014-06-17 17:20:50 -05:00
Erik Johnson
2a5698b6ab Add external ref target for batching page 2014-06-17 17:20:50 -05:00
Erik Johnson
3a61446f06 Add new pages to targeting toctree 2014-06-17 17:20:49 -05:00
Erik Johnson
40d96af27c Add new docs pages for pillar and ipcidr matchers 2014-06-17 17:20:49 -05:00
Thomas S Hatch
b40757950c Merge pull request #13505 from s0undt3ch/hotfix/setup-raet
Differentiate ZeroMQ from RAET based installations
2014-06-17 13:53:43 -06:00
Erik Johnson
1a4e1c7944 Remove italics
These are out-of-place in the context of the other steps in this
particular section, and thus unnecessary.
2014-06-17 14:47:19 -05:00
Joseph Hall
36cf034f67 Add docs on writing SDB modules 2014-06-17 11:41:54 -06:00
Joseph Hall
b915488294 Mark SDB as experimental 2014-06-17 11:41:54 -06:00
Joseph Hall
7ec89b7658 Rename db doc dir to sdb 2014-06-17 11:41:54 -06:00
Joseph Hall
aff6e4da20 Fix typos in SDB docs 2014-06-17 11:41:54 -06:00
Joseph Hall
69f1a83dbe Initial documentation for SDB loader 2014-06-17 11:41:54 -06:00
Pedro Algarvio
4ba108a0d7 Also provide a pip example on how to pass the global variable 2014-06-17 16:01:11 +01:00
Pedro Algarvio
a2c8175181 Document the --salt-transport option 2014-06-17 15:53:29 +01:00
Pedro Algarvio
85427e73d7 Update install documentation to reflect RAET deps 2014-06-17 15:36:02 +01:00
Erik Johnson
72711727b3 remove 2nd person pronoun 2014-06-16 21:19:32 -05:00
Erik Johnson
f915de5784 Add reminder about firewall to salt-cloud troubleshooting page 2014-06-16 17:29:08 -05:00
Seth House
d80a5c4886 Added salt-cloud events to the event list 2014-06-13 23:23:55 -06:00
rallytime
1612be139f Added note about grain lowercase resolution 2014-06-13 16:03:38 -06:00
David Boucha
b54068c57d document new windows installers 2014-06-12 15:36:05 -06:00
Colton Myers
51aefc9389 Add release notes for 2014.1.5 and bump docs version 2014-06-11 12:03:31 -06:00
rallytime
cd91d4c9cc Added expensiveTest documentation to cloud testing docs 2014-06-11 11:17:27 -06:00
rallytime
ce43e04769 change cloud docs to reflect runtest changes 2014-06-10 10:32:38 -06:00
rallytime
35155cc587 Documentation for cloud provider integration tests 2014-06-09 14:49:50 -06:00