Commit Graph

27025 Commits

Author SHA1 Message Date
Pedro Algarvio
6960382f0d Merge pull request #10874 from terminalmage/shar-script
Add shar pkg build script
2014-03-01 10:13:56 +00:00
George Marshall
3b285ac0f6 Merge branch 'utils_fix' of github.com:georgemarshall/salt into utils_fix 2014-02-28 21:57:34 -08:00
George Marshall
0114ae7ae6 Fix modules.tomcat _auth function 2014-02-28 21:57:04 -08:00
George Marshall
96ec70d80d Fixed utils.option so that it can properly traverse a dict 2014-02-28 21:57:04 -08:00
George Marshall
8f66db2e0f Teach utils.option to fail so that it can succeed 2014-02-28 21:57:03 -08:00
Erik Johnson
381d6ac305 Add shar pkg build script 2014-02-28 21:48:15 -06:00
Michal Bicz
d5c9ff3ade make sure top.sls is evaluated in order 2014-02-28 19:33:36 -08:00
Mike Place
3564381f0e Merge pull request #10872 from cvrebert/patch-1
fix typos in modules.influx.query's docstring
2014-02-28 20:16:20 -07:00
Chris Rebert
51d80ad398 fix typos in modules.influx.query's docstring 2014-02-28 18:52:19 -08:00
Samuel M Smith
c034dde502 Added Unix Domain Socket Support Stack and Yard
With preliminary behaviors
2014-02-28 18:58:07 -07:00
Thomas S Hatch
06c28b20c9 Merge pull request #10851 from jacksontj/reactorperf
Cache client objects in reactor.
2014-02-28 16:57:31 -08:00
Thomas S Hatch
18c5ac99c2 Fix ioflo master to read in from the correct queue 2014-02-28 17:56:13 -07:00
Thomas Jackson
5a087e412d Move to a class variable (and rename) 2014-02-28 15:45:37 -08:00
Thomas Jackson
089ea74928 rename the cache object 2014-02-28 14:16:36 -08:00
Mike Place
b929092c77 Exception handling in multi-master setup.
Refs #10732
2014-02-28 11:48:53 -07:00
Thomas Jackson
ea7896316a Pylint syle cleanup 2014-02-28 08:54:32 -08:00
Thomas S Hatch
0e7124acae Merge pull request #10865 from pass-by-value/halite_doc_updates
Halite doc updates
2014-02-28 08:18:19 -07:00
Thomas S Hatch
050a71a6e8 Merge pull request #10855 from ticosax/docker.script-docstring
Explain in docstring what this function aim to do
2014-02-28 08:12:07 -07:00
Thomas S Hatch
83bca6d429 Merge pull request #10854 from pengyao/ext_pillar
example should use escape character
2014-02-28 08:11:47 -07:00
Thomas S Hatch
5b8a84c963 Merge pull request #10848 from gtmanfred/develop
[salt.cloud] key_filename is not always set for expanduser
2014-02-28 08:03:59 -07:00
Joshua Kwan
b14de36db5 Allow 'known_hosts_file' as SSH client option
This allows us to use a known hosts file so we don't have to disable
strict host key checking to SSH into hosts we haven't SSH'd into before.
2014-02-28 09:47:42 -05:00
Mike Place
08bdcfae3d Merge pull request #10863 from topochan/patch-1
Fix in nagios module for run_*_pillar
2014-02-28 07:09:28 -07:00
Jens Rantil
ea117cfdf5 doc(pillar/git): document setting custom root 2014-02-28 14:58:44 +01:00
Jens Rantil
bd6bfaf809 feat(pillar/git): support custom root for GIT Pillar 2014-02-28 14:58:43 +01:00
Miguel Angel Guillén
b3a514ba5f Update nagios.py 2014-02-28 14:37:24 +01:00
Pedro Algarvio
1574ee1b15 Merge pull request #10853 from cachedout/brew_lint
Pylint var name case
2014-02-28 12:50:00 +00:00
Joseph Hall
53124953a0 Merge pull request #10858 from topochan/patch-1
Cleanup run and run_all params in nagios module
2014-02-28 04:24:31 -07:00
Joseph Hall
a45d67e2e8 Merge pull request #10856 from ticosax/docs-addon
Docs addon
2014-02-28 04:18:50 -07:00
Christophe Drevet-Droguet
a7cce74daf fix lint errors: multiple space before operator 2014-02-28 12:06:22 +01:00
Christophe Drevet-Droguet
715e9345a0 fix lint error comparisons with None 2014-02-28 12:03:38 +01:00
George Marshall
791f2ccdf3 Fix modules.tomcat _auth function 2014-02-28 02:08:02 -08:00
George Marshall
f093be2a06 Fixed utils.option so that it can properly traverse a dict 2014-02-28 01:54:48 -08:00
Christophe Drevet-Droguet
5bffb207de mysql_query: update doc 2014-02-28 10:43:36 +01:00
Christophe Drevet-Droguet
8354b0763a support for the 'test' option 2014-02-28 10:43:36 +01:00
Christophe Drevet-Droguet
1bc4a92d64 fix query result when 0 row is returned 2014-02-28 10:43:36 +01:00
Christophe Drevet-Droguet
523683ca54 store in grains and execute once if overwrite is false 2014-02-28 10:43:36 +01:00
Christophe Drevet-Droguet
88dac06bb2 mysql.query state 2014-02-28 10:43:36 +01:00
Miguel Angel Guillén
5d0c8897cd Cleanup run and run_all params 2014-02-28 09:45:41 +01:00
Nicolas Delaby
3ea1ad0bc3 typo 2014-02-28 09:27:49 +01:00
Nicolas Delaby
2925e7618d add reference to htpasswd module in states index 2014-02-28 09:27:13 +01:00
Nicolas Delaby
346b2f4aab Explain in docstring what this function aim to do 2014-02-28 09:22:42 +01:00
Thomas Jackson
1a54a45f39 Move cached ttl dict to its own util class 2014-02-27 23:23:18 -08:00
pengyao
721ca2bf21 example should use escape character
echo command will clear the quotation mark, should use escape character("\")
2014-02-28 15:19:37 +08:00
Mike Place
5ce9c2cdf3 Pylint var names. 2014-02-28 00:05:03 -07:00
Thomas Jackson
5f2450b58c Change variable names 2014-02-27 22:53:53 -08:00
Mike Place
d39795dc3d Merge pull request #10847 from rallytime/brew_test
Started writing brew unit tests
2014-02-27 23:30:39 -07:00
Mike Place
a81562b60a Merge pull request #10849 from whiteinge/doc-glossary-links
Added links from glossary entries
2014-02-27 22:49:38 -07:00
Thomas Jackson
cd5b613162 Typo! 2014-02-27 21:44:23 -08:00
Thomas Jackson
a43ebf1556 Cache client objects in reactor.
If you have a lot of events the current system of loading all clients on each event doesn't work-- because it loads all runners (for example).
2014-02-27 20:42:39 -08:00
rallytime
48e3f718ff pylint fixes 2014-02-27 21:33:50 -07:00