Tor Hveem
41be17299d
Catch exception when state does not return dictionary. Also print the
...
error producing state.
2012-12-22 01:29:41 +01:00
Tor Hveem
230e9d599f
Merge remote-tracking branch 'upstream/develop' into develop
2012-12-20 15:56:35 +01:00
Sean Channel
43b9c2a1b8
Merge pull request #2960 from seanchannel/develop
...
version update
2012-12-20 00:38:06 -08:00
Sean Channel
eea86ab5bf
version update
2012-12-19 23:28:57 -08:00
Thomas S Hatch
3fcaba4caf
Hook reactor docs into the table of contents
2012-12-19 22:10:46 -07:00
Thomas S Hatch
29f2132ca9
Get some reactor docs up
2012-12-19 22:09:44 -07:00
Thomas S Hatch
8cb665e107
Add cache runner as per #2897
2012-12-19 18:24:08 -07:00
Thomas S Hatch
1e2da7f5ce
Fix #2958
2012-12-19 16:57:43 -07:00
Pedro Algarvio
103571e65e
Merge branch 'develop' of github.com:saltstack/salt into develop
2012-12-19 23:30:39 +00:00
Pedro Algarvio
6a99d95377
Allow settings the parser's epilog to None.
2012-12-19 23:30:06 +00:00
Thomas S Hatch
037e878f33
Merge pull request #2953 from ryanschneider/develop
...
Explicitly add the portage lib to sys.path if not found.
2012-12-19 15:22:55 -08:00
David Boucha
1aa4477eae
Merge pull request #2957 from UtahDave/develop
...
fix small typo - globbing, not globing
2012-12-19 14:53:19 -08:00
David Boucha
8d64d123d6
fix small typo - globbing, not globing
2012-12-19 15:52:12 -07:00
Ryan Schneider
bb58351851
Explicitly add the portage lib to sys.path if not found.
2012-12-19 12:54:00 -08:00
David Boucha
e390a6e613
Merge pull request #2952 from archtaku/docs
...
More docs updates
2012-12-19 12:50:03 -08:00
Erik Johnson
7415755653
More docs updates
...
Added the same links to returner and renderer docs as I did for grains,
states, and modules last night.
2012-12-19 14:35:43 -06:00
Joseph Hall
7f4bf487e6
Merge pull request #2951 from UtahDave/add_win_repo
...
First step toward Windows software repo
2012-12-19 12:13:39 -08:00
David Boucha
3c13138a6f
genrepo now creates a repo cache file
...
logging doesn't seem to be working correctly, but it does
create the cache file correctly.
2012-12-19 12:43:42 -07:00
David Boucha
84de83b62d
Add winrepo runner and initial testing code
2012-12-19 12:43:42 -07:00
David Boucha
b5e59a7fb7
Add win_repo and cachefile default configs
2012-12-19 12:43:42 -07:00
David Boucha
5890ca8733
Merge pull request #2949 from techhat/nova
...
Add more nova functionality
2012-12-19 09:33:28 -08:00
Joseph Hall
d6ed77017f
Add list and show functions from nova
2012-12-19 10:32:18 -07:00
Sean Channel
1831c0d360
Merge pull request #2942 from nkuttler/debian_build_fix
...
Thank you for catching this @nkuttler!
2012-12-19 09:03:44 -08:00
Joseph Hall
c4da4e8ce6
Start adding security group functions
2012-12-19 09:57:58 -07:00
Thomas S Hatch
cc06837fe0
Merge pull request #2948 from dangets/subprocess
...
Changed subprocess.Popen call to salt's cmd.run in _linux_gpu_data
2012-12-19 07:54:15 -08:00
Thomas S Hatch
d26ce0bd2e
Merge pull request #2944 from dangets/locale_grain
...
Moved locale_info grain outside of os_data
2012-12-19 07:20:57 -08:00
Thomas S Hatch
9b34135e73
Merge pull request #2943 from ryanschneider/test_cleanup
...
Some minor cleanup of unit and integration tests.
2012-12-19 07:18:47 -08:00
Danny George
7c38730cdb
Changed subprocess.Popen call to salt's cmd.run
...
Per suggestion by SEJeff removed call to subprocess
Also simplified vendor default field logic
2012-12-19 07:33:18 -07:00
Seth House
abffab5315
Merge pull request #2946 from archtaku/docs
...
Updated docs for grains, modules, and states
2012-12-19 04:49:27 -08:00
Erik Johnson
5def1dd54c
Updated docs for grains, modules, and states
...
Added links to module function documentation, as well as to
"file_roots", and mentioned the saltutil.sync_* functions. Will probably
do the same for returners and renderers soon. This should help people
navigate through the docs easier.
2012-12-18 23:29:36 -06:00
David Boucha
587c08c169
Merge pull request #2945 from techhat/fedoraremi
...
Adding fedoraremi (Fedora Remix) to _OS_NAME_MAP
2012-12-18 20:04:03 -08:00
Danny George
0b17605685
Moved locale_info grain outside of os_data
...
cleaning up os_data function
created locale_info function to provides defaultlanguage and
defaultencoding
These were previously in os_data, but no reason to be
2012-12-18 19:18:18 -07:00
Ryan Schneider
8f8cc74b34
Some minor cleanup of unit and integration tests.
2012-12-18 17:39:16 -08:00
Nicolas Kuttler
f8e7b70ac7
Build docs before trying to copy doc files
2012-12-19 01:38:19 +01:00
Thomas S Hatch
dad6d6ac75
Merge pull request #2940 from giantlock/develop
...
cron.file state fix
2012-12-18 15:35:56 -08:00
Thomas S Hatch
77df0a2dbf
Start on the reactor docs
2012-12-18 16:34:22 -07:00
Denis Generalov
f0bc41424d
cron.raw_cron needs exactly raw stdout from cmd.run
2012-12-19 03:09:38 +04:00
David Boucha
75b3ad63ad
Merge pull request #2939 from peterlandry/develop
...
Remove reference to schema
2012-12-18 14:19:05 -08:00
Peter Landry
bf85260768
Remove reference to schema
...
Postgresql has a meaningful difference between schema and database, so conflating them here could be confusing:
http://www.postgresql.org/docs/9.2/static/ddl-schemas.html
2012-12-18 17:09:15 -05:00
Thomas S Hatch
58dd257b55
Merge pull request #2938 from techhat/glance
...
Change nova references to glance
2012-12-18 13:52:58 -08:00
Thomas S Hatch
5648117b8b
Add release docs
2012-12-18 14:51:42 -07:00
Joseph Hall
7971c53767
Change nova references to glance
2012-12-18 14:51:32 -07:00
Thomas S Hatch
aa41b5527d
Merge pull request #2936 from ryanschneider/cmd.run-templates
...
cmd and archive modules template arg
2012-12-18 12:31:46 -08:00
Ryan Schneider
fa169fe36d
Add template argument docs for cmd.run*
2012-12-18 11:14:16 -08:00
Ryan Schneider
bf877ac051
Add docstrings for template arg.
2012-12-18 10:59:46 -08:00
David Boucha
279b77f4ef
Merge remote-tracking branch 'upstream/master' into develop
2012-12-18 11:54:20 -07:00
Ryan Schneider
7dc65012dc
Merge remote branch 'upstream/develop' into cmd.run-templates
2012-12-18 10:14:03 -08:00
Thomas S Hatch
4c275e8071
Merge pull request #2935 from techhat/develop
...
user_role_list now requires both a user and a tenant
2012-12-18 09:25:54 -08:00
Joseph Hall
b869fc9e3f
user_role_list now requures both a user and a tenant
2012-12-18 10:20:29 -07:00
Thomas S Hatch
f63579afb4
Merge pull request #2934 from dangets/gpu_grain
...
Added basic gpu info grain for linux
2012-12-18 08:58:38 -08:00
