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
76,847 Commits 24 Branches 182 Tags 341 MiB
ddedf05b7d
Commit Graph

324 Commits

Author SHA1 Message Date
Colton Myers
8d86bc3056 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    salt/states/rabbitmq_user.py
    salt/states/user.py
 2015-11-23 09:53:11 -07:00
Mike Place
52e650aed9 Add section to style guide 
A brief discussion of variable naming standards in Salt.
 2015-11-20 09:23:39 -07:00
Mike Place
3a7e5a105b Add section to style guide 
A brief discussion of variable naming standards in Salt.
 2015-11-19 12:01:18 -07:00
Colton Myers
f1c80ab943 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    salt/utils/schedule.py
 2015-11-17 16:18:12 -07:00
rallytime
60e6eddb77 A couple of spelling fixes for doc conventions page. 2015-11-15 14:49:47 -07:00
rallytime
cded9ac01d Merge branch '2015.8' into 'develop' 
Conflicts:
- salt/cloud/clouds/vmware.py
- salt/modules/freebsdpkg.py
- salt/modules/virtualenv_mod.py
- salt/states/boto_asg.py
- tests/integration/__init__.py
- tests/runtests.py
 2015-11-06 09:34:31 -07:00
rallytime
eec9d69387 Merge branch '2015.5' into '2015.8' 
Conflicts:
	salt/modules/virtualenv_mod.py
	salt/states/file.py
	tests/integration/__init__.py
 2015-11-04 15:52:59 -07:00
rallytime
d31b0d1573 Merge branch '2015.8' into develop 2015-11-04 15:40:03 -07:00
Benjamin Drung
89dcb66310 Fix the wrong "allow to do" phrase 
"allow to do" is not a valid English phrase. Either use a gerund (allow
doing) or add a patient/object (allow someone to do).
 2015-11-04 12:15:41 +01:00
Benjamin Drung
5f7fc5f94b Fix typo an edditable -> editable 2015-11-04 11:06:16 +01:00
Benjamin Drung
0b768944c2 Fix typo an deamon -> daemon 2015-11-04 11:06:16 +01:00
rallytime
a959681858 Add link to Sending a GH PR to documentation docs 2015-11-03 14:07:49 -07:00
rallytime
1c612e2772 Update contributing and documentation pages to recommend submitting against branches 
Fixes #28272
 2015-11-03 10:44:29 -07:00
Colton Myers
32969b2408 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    doc/topics/cloud/digitalocean.rst
    salt/cloud/clouds/digital_ocean.py
    salt/cloud/clouds/linode.py
    salt/loader.py
    salt/modules/blockdev.py
    salt/modules/boto_route53.py
    salt/modules/boto_vpc.py
    salt/modules/bsd_shadow.py
    salt/modules/file.py
    salt/modules/rabbitmq.py
    salt/modules/schedule.py
    salt/modules/win_network.py
    salt/runners/state.py
    salt/spm/__init__.py
    tests/unit/modules/blockdev_test.py
 2015-11-02 18:19:01 -07:00
Colton Myers
3286a5250f Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/topics/installation/windows.rst
    doc/topics/tutorials/pillar.rst
    pkg/windows/installer/Salt-Minion-Setup.nsi
    salt/modules/file.py
    salt/modules/schedule.py
    salt/pillar/git_pillar.py
    salt/states/boto_route53.py
    salt/states/pkg.py
    tests/integration/modules/pillar.py
 2015-10-30 16:05:26 -06:00
Florian Ermisch
6d4316b0ac Correct Jinja function load_* to import_* 
Fixes #28248.
Also added a YAML example because really, who wants to write json by hand? ;)

Don't know if this is mentioned in the pillar docs but would be very useful there, too.
 2015-10-24 12:13:37 +02:00
Michael Vogel
cb8a72d580 Fix #28060 
Correct the `pip` command. install should be getting `global-options` not `pip` itself.
 2015-10-19 09:54:12 -06:00
Michael Vogel
fc8d51aa5c Fix #28060 
Correct the `pip` command. install should be getting `global-options` not `pip` itself.
 2015-10-17 18:35:18 +02:00
Colton Myers
6537da77fe Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/grains/core.py
    salt/loader.py
    salt/minion.py
    salt/modules/dockerng.py
    salt/modules/rest_package.py
    salt/modules/ssh.py
    salt/modules/state.py
    salt/modules/timezone.py
    salt/modules/zypper.py
    salt/runners/state.py
    salt/state.py
    salt/states/virtualenv_mod.py
    salt/utils/cloud.py
 2015-10-13 17:27:48 -06:00
rallytime
8c056ba501 Add mention of Periodic Table naming scheme to deprecation docs 2015-10-12 13:08:50 -06:00
Mike Place
a668c3543b Merge pull request #27554 from pass-by-value/doc_sphinx_version 
Update Sphinx version number in docs
 2015-09-30 10:41:27 -06:00
Aditya Kulkarni
18868de6ea Change Sphinx version number in docs 2015-09-30 11:46:06 -04:00
Colton Myers
41cad702e3 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/minion.py
    salt/modules/rest_service.py
    salt/states/dockerng.py
    salt/utils/cloud.py
 2015-09-29 18:13:33 -06:00
Meggie Woodfield
1c779700f6 Adding stretch label definition 2015-09-25 10:59:07 -06:00
Colton Myers
896313bff0 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/pillar/s3.py
 2015-09-14 15:01:41 -06:00
Arnold Bechtoldt
b9e5095bf5 add GH issue label SPM to docs 2015-09-12 11:14:26 +02:00
Colton Myers
307d3d05a4 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    doc/man/salt.7
    salt/modules/yumpkg.py
 2015-09-03 14:24:45 -06:00
Colton Myers
1e1f5f3a95 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/conf.py
    doc/topics/cloud/config.rst
    doc/topics/cloud/index.rst
    salt/modules/git.py
    salt/states/git.py
    salt/states/pkgrepo.py
 2015-09-01 15:35:21 -06:00
Jacob Hammons
0ec036350d Updates to salt-ssh and salt-key 
#24510
 2015-08-31 20:00:30 -06:00
Jacob Hammons
992edc3bb8 Doc bug fixes 
Refs #26192
Refs #26638
Refs #26644
Refs #26108
 2015-08-31 16:05:50 -06:00
Colton Myers
73282d51cc Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/cli/daemons.py
    salt/master.py
    salt/minion.py
    salt/modules/gpg.py
    salt/modules/pw_group.py
    salt/utils/http.py
    setup.py
    tests/unit/modules/schedule_test.py
 2015-08-19 11:29:45 -06:00
Colton Myers
d3d0e004d9 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    salt/minion.py
    salt/modules/gpg.py
    salt/modules/keystone.py
    salt/modules/pw_user.py
    salt/states/reg.py
    setup.py
 2015-08-17 16:54:16 -06:00
Pedro Algarvio
e7cb3be2a0 Document the added options 2015-08-17 19:48:48 +01:00
Nitin Madhok
714f9766e7 Correct spelling of integration in docs 2015-08-12 13:30:03 -04:00
Nitin Madhok
264f3bf656 Correct spelling of integration in docs 2015-08-12 13:27:30 -04:00
Nitin Madhok
ea738f0d2d Correct spelling of integration in docs 2015-08-12 13:23:26 -04:00
Colton Myers
1b0b21394e Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/cloud/clouds/vmware.py
    salt/modules/win_system.py
 2015-08-10 13:27:31 -06:00
Jacob Hammons
d8d5045d3b Updates to cloud docs for the provider > driver change in provider configs. 
Refs #24797
 2015-08-10 09:20:26 -06:00
Colton Myers
d5fbd960fe Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/cloud/clouds/vmware.py
    salt/fileserver/s3fs.py
    salt/modules/chocolatey.py
    salt/modules/s3.py
    salt/modules/zpool.py
    salt/pillar/s3.py
    salt/utils/s3.py
    tests/unit/modules/s3_test.py
 2015-08-03 15:01:35 -06:00
Colton Myers
e29be766bb Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    debian/changelog
    doc/man/salt.7
    salt/cloud/__init__.py
    salt/cloud/clouds/proxmox.py
    salt/cloud/clouds/vmware.py
    salt/config.py
    salt/fileclient.py
    salt/minion.py
    salt/modules/chocolatey.py
    salt/modules/localemod.py
    salt/modules/pacman.py
    salt/modules/pkgng.py
    salt/modules/schedule.py
    salt/modules/state.py
    salt/modules/win_file.py
    salt/modules/win_pkg.py
    salt/state.py
    salt/states/file.py
    salt/utils/args.py
    tests/unit/states/file_test.py
 2015-07-30 16:54:44 -06:00
Justin Findlay
d377f42c48 rework deprecation documentation for release names 
Fixes #25827.
 2015-07-29 15:50:33 -06:00
Jacob Hammons
9830921032 Refs #25063 
Refs #25473
 2015-07-16 13:24:01 -06:00
Ryan Lewis
91acf739fe Added docs for gotchas when developing on gentoo 2015-07-16 08:19:10 +12:00
Steven Braverman
8416299cc1 Updates documentation for external_pillar - Fixes Bash Example 2015-07-14 14:26:00 -07:00
Steven Braverman
09c0c9c64e Updates documentation for external_pillar - example on how to use 2015-07-13 11:56:28 -07:00
Colton Myers
99fc7ecb4b Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    doc/man/salt-call.1
    doc/man/salt-cloud.1
    doc/man/salt-cp.1
    doc/man/salt.7
    salt/cloud/__init__.py
    salt/fileclient.py
    salt/modules/file.py
    salt/modules/gpg.py
 2015-06-29 16:49:40 -06:00
Justin Findlay
8575192cc4 revise label and milestone documentation 2015-06-27 16:17:44 -06:00
Justin Findlay
152a9b2a12 fix some malformed doc links and anchors 2015-06-24 16:56:52 -06:00
Mike Place
7dae045b3c Remove overstate documentation 2015-06-12 13:00:08 -06:00
Colton Myers
94d6ef1d17 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    doc/ref/modules/all/salt.modules.ipmi.rst
    doc/ref/states/all/salt.states.tls.rst
    doc/topics/cloud/index.rst
    doc/topics/cloud/vsphere.rst
    doc/topics/eauth/index.rst
    salt/cli/batch.py
    salt/modules/cmdmod.py
    salt/modules/ipmi.py
    salt/netapi/rest_cherrypy/app.py
    salt/runners/http.py
    salt/states/boto_elb.py
    salt/states/dockerio.py
    salt/states/linux_acl.py
    salt/states/win_servermanager.py
    salt/wheel/config.py
 2015-06-09 11:41:07 -06:00
Jacob Hammons
d45c4ed11f Bug fixes and build errors 
Refs #23211
Refs #24268
Refs #24235
Refs #24193
Refs #24172
Refs #19901
Refs #19801
 2015-06-05 17:32:35 -06:00
Justin Anderson
a6a1f87cd9 Merge pull request #24380 from rallytime/bp-24357 
Backport #24357 to 2015.5
 2015-06-04 14:13:51 -06:00
rallytime
bf85772042 Make sure the parameters are in the correct order 2015-06-04 11:39:39 -06:00
rallytime
9f53809cde Add "* Change" label parameters 2015-06-04 11:39:39 -06:00
rallytime
b27a15e774 Remove "workaround" wording 2015-06-04 11:39:39 -06:00
rallytime
9fff35a959 Some small fixes 2015-06-04 11:39:39 -06:00
rallytime
54a7089fd6 Link the new labels doc in contributing and hacking docs 2015-06-04 11:39:39 -06:00
rallytime
375695e696 Add pull request label definitions 2015-06-04 11:39:39 -06:00
rallytime
de945638d3 Add Feature Request label definition 2015-06-04 11:39:39 -06:00
rallytime
684f291bd4 Add issue definition and augment functional areas section 2015-06-04 11:39:39 -06:00
rallytime
2da13dd525 Start a "what are all of these labels for?" doc 2015-06-04 11:39:38 -06:00
zhujinhe
f08c875015 fix invoke issues of Jinja Macros example 
1.'php_ini' not defined in /srv/pillar/php.sls, {{ salt.pillar.get('php_ini', {}) | json() }} gets empty value.
2.no section defined, should be 'section_name'.
3.remove empty line.
 2015-06-03 16:38:16 -06:00
zhujinhe
15cdd58968 fix invoke issues of Jinja Macros example 
1.'php_ini' not defined in /srv/pillar/php.sls, {{ salt.pillar.get('php_ini', {}) | json() }} gets empty value.
2.no section defined, should be 'section_name'.
3.remove empty line.
 2015-06-03 12:16:29 +08:00
Jason Thigpen
beff7c7785 Correct usage of import_yaml in formula documentation 2015-05-31 09:43:15 -06:00
Jason Thigpen
37775a5fa6 Correct usage of import_yaml in formula documentation 2015-05-29 17:12:59 -07:00
Colton Myers
c4f5e231fa Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop2 
Conflicts:
    doc/_themes/saltstack2/layout.html
    doc/conf.py
    doc/index.rst
    doc/ref/modules/all/salt.modules.hipchat.rst
    doc/topics/releases/index.rst
    salt/client/ssh/client.py
    salt/cloud/clouds/vsphere.py
    salt/modules/boto_dynamodb.py
    salt/modules/boto_route53.py
    salt/modules/data.py
    salt/modules/http.py
    salt/modules/tls.py
    salt/output/compact.py
    salt/states/boto_elb.py
    salt/states/linux_acl.py
    salt/states/rabbitmq_user.py
    salt/states/win_servermanager.py
    salt/utils/dictupdate.py
    salt/wheel/config.py
 2015-05-29 15:10:13 -06:00
Jacob Hammons
0689815d0e Fixes for doc build errors 2015-05-27 11:40:31 -06:00
Colton Myers
60f2e9eefb Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    doc/topics/development/contributing.rst
    salt/modules/tls.py
 2015-05-26 16:38:42 -06:00
Justin Findlay
fa2d411f53 update example release branch in contrib docs 2015-05-25 23:06:39 -06:00
Justin Findlay
a0b76b57b3 clarify git rebase instructions 2015-05-25 23:05:23 -06:00
Justin Findlay
3517e0095f fix contribution docs link typos 2015-05-25 22:55:19 -06:00
Justin Findlay
651629c6a4 backport dev contrib doc updates to 2015.5 2015-05-25 22:54:54 -06:00
Oliver Bestwalter
4ba0f20ef6 fix typos 2015-05-14 01:23:20 +02:00
rallytime
0fe9d05ab0 Make sure the parameters are in the correct order 2015-05-05 14:35:44 -06:00
rallytime
e9491e8991 Add "* Change" label parameters 2015-05-05 14:21:25 -06:00
rallytime
8024acc7ad Remove "workaround" wording 2015-05-05 13:47:34 -06:00
rallytime
ed788a2965 Some small fixes 2015-05-05 13:37:44 -06:00
rallytime
475a32d3aa Link the new labels doc in contributing and hacking docs 2015-05-05 13:23:08 -06:00
rallytime
644201aed8 Add pull request label definitions 2015-05-05 13:11:59 -06:00
rallytime
3c95bd9a6b Add Feature Request label definition 2015-05-04 12:43:34 -06:00
rallytime
1780e2eb8a Add issue definition and augment functional areas section 2015-05-04 11:39:32 -06:00
rallytime
85e9284bac Start a "what are all of these labels for?" doc 2015-05-03 21:11:18 -06:00
Justin Findlay
e586c66917 revise contributing documentation 2015-04-16 10:28:00 -06:00
rallytime
ccfa9f8158 Fix some broken links on the contributing docs 
Fixes #22537
 2015-04-10 14:06:36 -06:00
Justin Findlay
f50949e209 revise unit test documentation 2015-03-31 00:40:05 -06:00
Justin Findlay
0f631abe58 fix contributing doc errors 2015-03-10 16:04:17 -06:00
Justin Findlay
79255566b9 revise saltstack/salt contrib documentation 2015-02-25 15:05:21 -07:00
Mike Place
970c32ae8e Document the bug reporting procedure 2015-02-18 09:22:28 -07:00
Brandon Weaver
894d8d8c1a Fix typo 
Found a minor typo, quick fix.
 2015-02-17 13:09:51 -08:00
toppur
cdbaff63b7 Update formulas.rst 
There's not keyword named 'base' here, should be 'default'.
 2015-02-09 18:24:11 -08:00
rallytime
d724ed3a47 Merge branch '2015.2' into 'develop' 
Conflicts:
	salt/cli/batch.py
	salt/cloud/clouds/msazure.py
	tests/integration/netapi/rest_tornado/test_app.py
 2015-01-16 11:36:32 -07:00
Colton Myers
d1b201e2bf Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
	salt/runners/manage.py
	salt/utils/cloud.py
 2015-01-15 16:20:48 -07:00
rallytime
4d5cc90c6a Remove sshpass checks from utils/cloud.py and other references 
Fixes #19219
 2015-01-14 23:08:00 -07:00
Thomas S Hatch
0529136858 Merge pull request #19510 from JensRantil/sphinx-1.3b2 
doc(dev-bootstrap): Sphinx 1.3b2
 2015-01-08 09:57:42 -07:00
Jens Rantil
9e92864398 doc(dev-bootstrap): Sphinx 1.3b2 
I was getting an error that the current stable version of Sphinx wasn't
new enough. Installing Sphinx 1.3b2 did the trick.
 2015-01-08 08:04:11 +01:00
Thomas S Hatch
35af81b4b7 Merge pull request #19482 from JensRantil/warn-socketpath-early 
Development bootstrap documentation improvements
 2015-01-07 14:55:43 -07:00
Jens Rantil
30978b1070 doc(bootstrap-dev): mention short virtualenv path early 
This was the second time I ran into this issue. Annoying after going
through all the steps of installing applications in the virtual
environment etc.
 2015-01-07 22:25:31 +01:00
Jens Rantil
4666b29174 doc(bootstrap-dev): make long socket path warning a note 
It doesn't really feel like part of the text body.
 2015-01-07 22:25:24 +01:00
Jens Rantil
fee650b4b0 one less command to get started when bootstrapping 2015-01-07 21:41:19 +01:00
Justin Findlay
ad33589fac move requirements files into requirements dir 2014-12-27 17:29:03 -07:00
Colton Myers
dc778a8e5e Merge branch '2014.7' into develop 
Conflicts:
	salt/client/ssh/__init__.py
	salt/states/boto_secgroup.py
 2014-12-23 10:57:26 -07:00
Seth House
a33ae0655f Switch the :formula: extlink to :formula_url: 
The addition of the Salt domain conflicted with this role. Better to
rename this one to be more explicit and to save that real-estate for
future use.
 2014-12-19 14:34:57 -07:00
Colton Myers
fc16bd16c0 Merge branch '2014.7' into merge-forward 
Conflicts:
	doc/faq.rst
	doc/ref/states/compiler_ordering.rst
	doc/topics/best_practices.rst
	doc/topics/development/conventions/formulas.rst
	salt/config.py
	salt/modules/state.py
	salt/states/mount.py
	salt/utils/event.py
	tests/unit/utils/process_test.py
 2014-12-16 14:45:25 -07:00
Seth House
51fa87c446 Change all state examples to use short-dec format for consistency 
Closes #12419.

The command used to search the docs for state examples is below. This
generates a file in Vim's quickfix format that can be loaded with the -q
flag.

find . -type f \( -name '*.rst' -o -name '*.py' \) -print0
    | xargs -0 -P10 -n1 awk '
        BEGIN { RS=""; FS="\n" }
        { linenr = linect; linect += (NF + 1) }
        /^\s+[a-zA-Z0-9'\''_-]+:\n\s+[a-zA-Z0-9'\''_-]+:\n\s+- / {
            print FILENAME "|" linenr + 2 "|", $1
        }
    ' > ./salt-states.quickfix
 2014-12-12 23:36:40 -07:00
Seth House
c0567bab0f Updated Formula Best Practices doc with several recommendations 2014-12-12 17:43:00 -07:00
Thomas Jackson
fb7e5630d8 Comma cleanup 2014-12-12 11:39:40 -08:00
Thomas S Hatch
e094b0136f Merge pull request #18902 from jacksontj/develop 
More grammar/style cleanup
 2014-12-12 09:40:55 -07:00
Joseph Hall
7099c02a53 Add serial commas to the style guide 2014-12-12 03:30:11 -07:00
Thomas Jackson
498a612078 Whitespace cleanup 
Conflicts:
	doc/topics/cloud/linode.rst
	doc/topics/cloud/misc.rst
	doc/topics/cloud/parallels.rst
	doc/topics/cloud/proxmox.rst

Conflicts:
	doc/topics/development/architecture.rst
	doc/topics/development/translating.rst
 2014-12-11 07:53:19 -08:00
Nitin Madhok
d2685b8fa2 Fixing sphinx errors 2014-12-08 11:18:12 -05: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
Nicole Thomas
e1157d13be Revert "[don't merge!!] Add six dependency notice to building docs intructions" 2014-11-26 12:23:13 -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
Nitin Madhok
5d8ae4e32f Fixing sphinx violations and errors 2014-11-18 02:53:40 -05: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
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
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
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 Jackson
9f7dac0674 Spelling fixes for docs 2014-10-28 08:12:27 -07: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
Steve Weber
54b9aedbf7 ipython log to look for 2014-10-06 12:54:36 -04:00
Thomas S Hatch
3e204c16f3 Merge branch '2014.7' into develop 2014-09-29 20:07:01 -06:00
rallytime
0b99acc381 Add info about running unittests w/o integration test daemons 2014-09-28 10:52:37 -06:00
Erik Johnson
18456b6bbf Spelling and formatting fixes 2014-09-27 12:14:12 -05:00
Steve Weber
ca2841a7ec Update modular_systems.rst 2014-09-27 12:22:47 -04:00
Steve Weber
b6d2f6966a using ipython 
small fix
 2014-09-27 12:18:46 -04:00
Steve Weber
d444d833ce add some help using an interactive cli debugger 
when hacking some tricky code i find using ipython productive.
 2014-09-27 12:10:22 -04: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
Colton Myers
8d0bf0ee95 Merge branch '2014.7' into develop 
Conflicts:
	salt/states/pip_state.py
 2014-09-15 11:49:04 -06:00
Mike Place
f7d89816b1 Job flow doc 2014-09-12 11:01:30 -06:00
Nitin Madhok
773ccadeff Update formulas.rst code blocks 2014-09-05 16:34:24 -04: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
Seth House
47efe38949 Added instructions on how to back-port fixes to release branches 2014-08-27 20:17:12 -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
Mike Place
0d03e31fb7 Add info about pillar refresh. 2014-08-25 10:56:55 -06:00
wackycaptain
1032754af9 Fix broken links in contributing documentation. 2014-08-16 23:27:58 +02:00
Nitin Madhok
f99dac462b Update formulas.rst 
Fixes https://github.com/saltstack/salt/issues/14900
 2014-08-12 13:18:48 -04:00
Sylvain Bellemare
9f6ecc4874 Removed duplicate occurrences of the word "the" 2014-08-11 16:05:29 +02:00
Kamal Nasser
825bb191bf Replace all occurrences of "Digital Ocean" with "DigitalOcean" 2014-08-08 22:16:37 +03: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
Seth House
b656adef77 Fleshed out Formula Parameterization section 2014-08-06 10:51:46 -04:00