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
44,525 Commits 24 Branches 182 Tags 341 MiB
185856ddbb
Commit Graph

2111 Commits

Author SHA1 Message Date
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
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
rallytime
91538d7ec1 Add information about salt-cloud events to master events doc 2014-11-21 15:57:59 -07: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
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
Elias Probst
b0ead3f326 Typo in 2014.7.0 release notes (documentaiton → documentation). 2014-11-19 20:47:18 +01: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
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
nerdling
4d02c8da81 Update doc/topics/installation/osx.rst 
Unify instructions across package managers.
 2014-10-26 16:20:13 -04: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
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
Thomas S Hatch
77a795bd07 Merge pull request #16844 from fictivekin/fix-releasecandidate-doc-version 
change Release Candidate installation doc from rc3 to rc4
 2014-10-23 14:10:29 -06:00
Thomas S Hatch
1638e58245 Merge branch 'master' of https://github.com/jimmystewpot/salt into jimmystewpot-master 
Conflicts:
	doc/topics/cloud/aws.rst
 2014-10-23 13:29:24 -06:00
Mike Place
3767666ccb Note the presence of master_alive_interval in MM docs. 
Refs #14906
 2014-10-23 11:47:00 -06:00
Erik Johnson
d19c6b16ce Improve wording of RPM changes in helium release notes 2014-10-23 12:00:35 -05:00
Erik Johnson
b261c663fa Add notice of new packages for Helium release 2014-10-23 11:48:40 -05:00
Sean Coates
9e1685da6f change Release Candidate installation doc from rc3 to rc4 2014-10-23 11:32:53 -04:00
Colton Myers
fb2ae7cfbf Merge pull request #16822 from whiteinge/doc-reactor-changes 
Added versionadded and versionchanged directives to Reactor docs
 2014-10-22 15:08:39 -06:00
Seth House
1faec87514 Added versionadded and versionchanged directives to Reactor docs 
Also reworded and cross-linked the client interfaces docs.
 2014-10-22 15:07:05 -06:00
Erik Johnson
86078aea8c Normalize release notes with develop branch 2014-10-22 14:42:37 -05:00
Nicole Thomas
72537f0ee4 Merge pull request #16813 from holmboe/v2014.1.13-relnotes-in-develop 
Point to the correct latest 2014.1.13 release
 2014-10-22 10:16:53 -06:00
Henrik Holmboe
5d7184491f Document assigned codenames 2014-10-22 17:20:40 +02:00
Henrik Holmboe
20ee003c5f Point to the correct latest 2014.1.13 release 
This is recurring and #12720 is tracking the issue.
 2014-10-22 16:12:48 +02:00
rallytime
1ed3d1827e Release notes for 2014.1.13 2014-10-22 16:12:03 +02:00
Henrik Holmboe
d4258e9040 Point to the correct latest release 
This is recurring and #12720 is tracking the issue.
 2014-10-22 15:56:00 +02:00
jimmystewpot
271f6c4257 Update aws.rst 
remove note it was a typo
 2014-10-21 16:20:46 +11:00
jimmystewpot
8fd88cc0d3 Update aws.rst 
Updated the document to reflect a storage type that would work. Currently only gp2 and standard function because there is no support for the provisioned iops
 2014-10-21 16:18:31 +11:00
jimmystewpot
9edaf65bbe Update aws.rst 
added additional component for Ebs.
 2014-10-21 15:59:02 +11:00
jimmystewpot
abd8437205 Update aws.rst 
Added undocumented feature for Ebs.VolumeType to the example so people do not need to read the source to identify how to change the EBS volume Type:
 2014-10-21 15:57:42 +11:00
Thomas S Hatch
9992edfdca Merge branch '2014.7' into develop 
Conflicts:
	salt/loader.py
 2014-10-20 15:52:31 -06:00
Martyn Smith
a899af7418 Fix example command to one that exists 
Fix walkthrough to use disk.usage instead of disk.percent (which doesn't appear to exist any more).
 2014-10-21 09:51:54 +13:00
Erik Johnson
af25ad1019 Improvements to releases page 
This clarifies what the current stable release is. It also hides the
2014.7.0 release notes until we actually release that version.
 2014-10-20 14:11:51 -05:00
rallytime
559ed2906b Fix small typo in fedora installation docs 2014-10-20 12:06:46 -06:00
Thomas S Hatch
3cf0cfb61d Merge branch '2014.7' into develop 2014-10-20 09:20:37 -06:00
Erik Johnson
13a92bde69 Add further clarification that gitfs auth is pygit2-only 2014-10-19 17:01:13 -05:00
Pedro Algarvio
229eb00e8d Merge branch '2014.7' forward into develop 
Conflicts fixed.

Conflicts:
	salt/loader.py
	salt/returners/carbon_return.py
	salt/returners/couchbase_return.py
	salt/returners/couchdb_return.py
	salt/returners/elasticsearch_return.py
	salt/returners/local_cache.py
	salt/returners/memcache_return.py
	salt/returners/mongo_future_return.py
	salt/returners/mongo_return.py
	salt/returners/mysql.py
	salt/returners/odbc.py
	salt/returners/postgres.py
	salt/returners/redis_return.py
	salt/returners/smtp_return.py
	salt/returners/sqlite3_return.py
	salt/states/dockerio.py
	salt/utils/minions.py
 2014-10-19 18:21:19 +01:00
Erik Johnson
90ba9b8a43 Add notice that per-remote auth params are not supported in GitPython 2014-10-18 17:36:51 -05:00
Thomas S Hatch
2e9b63ed31 Add notes on cp module and -W/w 2014-10-18 09:24:31 -06:00
Thomas S Hatch
7a72ef2e27 Merge pull request #16688 from Supermathie/16682 
Add documentation addressing how to listen for events on minion
 2014-10-17 10:51:57 -06:00
Seth House
4846dcebbd Update the Reactor docs to use the local method instead of cmd 2014-10-17 09:17:34 -05:00
Mike Place
36288eef7f Clarify doc 2014-10-16 16:09:57 -06:00
Michael Brown
53e5b9ee09 Add documentation addressing how to listen for events on minion 
* Address #16682
 2014-10-16 14:55:34 -04:00
Erik Johnson
48e81ac32d Add new fileserver features to helium release notes 
Also made some formatting fixes
 2014-10-15 22:44:43 -05:00
Erik Johnson
00bd8477dd Fix sphinx build error 
There is no 'math' lexer in sphinx.
 2014-10-15 22:43:37 -05:00
Thomas S Hatch
9ec90bafea Merge branch '2014.7' into develop 
Conflicts:
	salt/output/__init__.py
 2014-10-13 17:41:42 -06:00
Thomas Jackson
e60f47052e Update ACL docs to include @jobs markup 2014-10-13 16:13:23 -07:00
Thomas S Hatch
1468c26ec1 Merge branch '2014.7' into develop 
Conflicts:
	doc/faq.rst
	doc/ref/configuration/minion.rst
	salt/minion.py
	salt/states/pkg.py
	salt/transport/__init__.py
 2014-10-13 15:03:33 -06:00
Thomas S Hatch
fecb0dfebb Merge pull request #16497 from thatch45/notes_2014.7 
Add some release notes updates
 2014-10-08 17:30:43 -06:00
Thomas S Hatch
678a551783 Add soem release notes updates 2014-10-08 16:40:34 -06:00
Seth House
57f2c4a4e3 Merge pull request #16494 from terminalmage/zeromq4 
Add information on how to upgrade to ZeroMQ 4 in Ubuntu and RHEL/CentOS
 2014-10-08 16:06:37 -06:00
Erik Johnson
8c80efd8eb Add info on upgrading to ZeroMQ 4 2014-10-08 16:56:28 -05:00
Erik Johnson
391a07e6ac Add info on upgrading to ZeroMQ 4 2014-10-08 16:51:33 -05:00
Colton Myers
710795b3b3 Merge pull request #16492 from saltstack/2014.7 
Merge forward 2014.7 into develop
 2014-10-08 15:25:56 -06:00
Colton Myers
5e25de90e9 Add 2014.1.12 release notes 2014-10-08 15:22:33 -06:00
Colton Myers
71f422fd4d Merge branch '2014.7' into develop 2014-10-07 15:10:40 -06:00
Colton Myers
059416e75b Update release candidate installation instructions for rc3 2014-10-07 15:09:16 -06:00
David Boucha
8464201a71 add links to Windows 2014.1.11 installers 2014-10-07 11:52:53 -06:00
Erik Johnson
cd1cce3baa Merge pull request #16400 from steverweber/doc_ipython 
ipython log to look for
 2014-10-06 22:07:41 -05:00
Thomas S Hatch
69b6a1c313 Merge branch '2014.7' into develop 2014-10-06 11:02:27 -06:00
Steve Weber
54b9aedbf7 ipython log to look for 2014-10-06 12:54:36 -04:00
Thomas S Hatch
38da77976c Merge pull request #16368 from Supermathie/16366 
documentation: add salt/ event prefix and explain how to get event tag while listening for events
 2014-10-06 10:21:00 -06:00
Tim O'Guin
156768408a updated masterless documentation to clarify the need to disable (or not run) the salt-minion daemon, otherwise the minion will attempt to connect to a master 2014-10-04 14:57:06 -05:00
Michael Brown
c928b09a9d documentation: add salt/ event prefix and explain how to get event tag while listening 
* partially addresses #16366
 2014-10-03 16:37:08 -04:00
C. R. Oldham
670a39a580 Add warning for FC19 users. 2014-10-03 13:29:41 -06:00
Mike Place
1975043730 Merge pull request #16332 from rallytime/fedora_docs 
Add intalling from testing section to fedora installation docs
 2014-10-03 13:06:27 -06:00
C. R. Oldham
3fef918352 Add warning for FC19 users. 2014-10-03 12:52:46 -06:00
Tim O'Guin
41978cc449 updated masterless documentation to clarify the need to disable (or not run) the salt-minion daemon, otherwise the minion will attempt to connect to a master 2014-10-03 01:35:28 -04:00
rallytime
b6075c7425 Add intalling from testing section to fedora installation docs 2014-10-02 13:44:22 -06:00
Joseph Hall
d65d12a460 Correct formatting of PagerDuty 2014-10-02 13:27:13 -06:00
Joseph Hall
4aadff6d2b Add Reactor tutorial to index 2014-09-30 12:57:48 -06:00
Joseph Hall
dc88103cdf Add tutorial on using Salt Cloud with the Event Reactor 2014-09-30 12:50:47 -06:00
Thomas S Hatch
3e204c16f3 Merge branch '2014.7' into develop 2014-09-29 20:07:01 -06:00
Thomas S Hatch
ea5c8518db Merge pull request #16246 from rallytime/pillar_docs 
Add note on how to set pillar data on the command line to pillar tutorial
 2014-09-29 20:03:47 -06:00
Thomas S Hatch
49b3646ad6 Merge pull request #16211 from rallytime/runtests_doc 
Add info about running unittests w/o integration test daemons
 2014-09-29 19:51:05 -06:00
Ed Kern
3933cdb72a pub_sig to pubkey_sign so that the tutorial isnt broken in /doc/topics/tutorials/multimaster_pki.rst 2014-09-29 16:21:08 -06:00
rallytime
38db7b7d5e Add note on how to set pillar data on the command line to pillar tutorial 
Closes #14217
 2014-09-29 16:04:30 -06:00
Ed Kern
93b0c1f80e pub_sig to pubkey_sign so that the tutorial isnt broken in /doc/topics/tutorials/multimaster_pki.rst 2014-09-29 12:27:08 -07:00
Joseph Hall
eed588f65b Merge pull request #16219 from steverweber/develop 
remove s in clouds
 2014-09-29 07:09:58 -06:00
Steve Weber
8290a473ca remove s in clouds 
fix var name
 2014-09-29 09:05:15 -04:00
rallytime
0b99acc381 Add info about running unittests w/o integration test daemons 2014-09-28 10:52:37 -06:00
Pedro Algarvio
7c3a1375c1 Merge pull request #16203 from techhat/microinstance 
Get rid of Micro Instance examples
 2014-09-27 20:59:06 +01:00
Erik Johnson
18456b6bbf Spelling and formatting fixes 2014-09-27 12:14:12 -05:00
Joseph Hall
9d6e4ff168 Get rid of Micro Instance examples 2014-09-27 11:09:08 -06:00
Erik Johnson
7782fc7146 Merge branch 'doc_debug' of https://github.com/steverweber/salt into steverweber-doc_debug 2014-09-27 11:41:01 -05:00