Commit Graph

8194 Commits

Author SHA1 Message Date
David Boucha
b784515b9d Remove check for configs. Only check for libraries
the __virtual__ function was checking for the existence of configs
in __opts__ and __pillar__. The virtual function doesn't have
access to config.option and so couldn't see the configs that existed
on the master.

Just check for the libraries now.
2012-11-16 10:02:35 -07:00
Pedro Algarvio
78a735e5b3 Merge branch 'develop' of github.com:saltstack/salt into cherry-pick/CLOEXEC 2012-11-16 16:18:42 +00:00
Thomas S Hatch
52cbcb1a12 Merge pull request #2578 from giantlock/develop
stateful is optional argument
2012-11-16 07:53:43 -08:00
Thomas S Hatch
8a61fae3db Merge pull request #2580 from s0undt3ch/develop
Handle `__version_info__` when local git tags are not up to date.
2012-11-16 07:51:35 -08:00
Denis Generalov
d50de8c8d3 arguments problem when using _delegate_to_state() 2012-11-16 18:55:02 +04:00
Pedro Algarvio
494be0fd28 Moved all open() calls to use our FD_CLOEXEC aware fopen() function.
* Additionally, PEP-8 fixes on edited files.
* Added the "Import python libs/Import salt libs" comments where missing(on edited files).
2012-11-16 12:53:27 +00:00
Pedro Algarvio
33abd0c158 Explain what FD_CLOEXEC does from the GNU C lib docs. 2012-11-16 11:35:04 +00:00
Pedro Algarvio
e183c62eb2 Minor PEP-8. 2012-11-16 11:34:50 +00:00
Pedro Algarvio
6ec7646d51 Merge branch 'develop' of github.com:saltstack/salt into cherry-pick/CLOEXEC 2012-11-16 11:25:49 +00:00
Pedro Algarvio
9a187544b2 Handle __version_info__ when local git tags are not up to date.
* We now Warn users about missing local git tags, let them know how to update them and, if not up to date, use the defined `__version__` and `__version_info__` instead of the parsed one.
2012-11-16 11:00:02 +00:00
Denis Generalov
fc9dd8c6c8 stateful is optional argument 2012-11-16 14:31:43 +04:00
Sean Channel
13e9c06d82 change version for daily builds 2012-11-15 23:53:52 -08:00
Thomas S Hatch
61c72dd2de Merge pull request #2576 from s0undt3ch/issues/2566
Deprecate `--xxx-out` in favour of `--out/--output`
2012-11-15 21:25:21 -08:00
Seth House
dc6fdd4e4b Added depends, optdepends, and configuration field lists to modules
Not sure why using field lists for this didn't occur to me sooner.
Refs #715 & refs #2454
2012-11-15 22:20:52 -07:00
Thomas S Hatch
02aac68611 Generate man pages for 0.10.5 2012-11-15 21:36:34 -07:00
Thomas S Hatch
fa25ab81f9 bump to version 0.10.5 2012-11-15 21:19:42 -07:00
Thomas S Hatch
bd2f09bae7 Merge pull request #2577 from mrtizmo/develop
Add user name to delete_user call in absent state
2012-11-15 19:59:35 -08:00
mrtizmo
44d8c404a8 Add user name to delete_user call in absent state 2012-11-15 20:17:13 -05:00
Pedro Algarvio
c60e4dd645 Fix tests and "convert" text output to "txt" when choosing outputter. 2012-11-16 00:07:08 +00:00
Pedro Algarvio
98067370ad Fix chicken/egg module import issue. 2012-11-15 23:52:46 +00:00
Pedro Algarvio
eb3fa5d9a5 Typo. 2012-11-15 23:36:25 +00:00
Pedro Algarvio
fcbfe622a5 Deprecate --*-out in favour of --out/--output. Fixes #2566.
* Added the necessary code to support the new `--output` option.
* Added the code to warn users on salt < 0.10.7 and error on salt >= 0.10.7
* In order to get the outputters at runtime, I need to add a switch to `salt.config.minion_config()`, `check_dns` which default to `True` to keep behaviour and when `False` speeds up it's use.
2012-11-15 23:27:23 +00:00
Thomas S Hatch
7845954ec9 Fix for #2567 2012-11-15 16:20:55 -07:00
Thomas S Hatch
974b5a8095 Merge pull request #2574 from johnthedebs/develop
Logic and test fixes for version, ri, rdoc support in gem state
2012-11-15 15:10:35 -08:00
John Debs
4a062f1e69 Logic and test fixes for version, ri, rdoc support in gem state 2012-11-15 18:05:06 -05:00
Thomas S Hatch
8fe1f97f81 Make ruby available for travis tests 2012-11-15 15:56:48 -07:00
Pedro Algarvio
e797eece4a Merge branch 'develop' of github.com:saltstack/salt into issues/2566 2012-11-15 22:15:52 +00:00
Thomas S Hatch
ab7febde27 Merge pull request #2573 from s0undt3ch/develop
Fix `salt.version.__version__` with git revision.
2012-11-15 14:14:13 -08:00
Pedro Algarvio
c7c3113dec Fix salt.version.__version__ with git revision.
* Make sure were issuing `git describe` on salt's source directory, not any other directory which might get us the wrong version string.
2012-11-15 22:11:38 +00:00
Thomas S Hatch
31368cccc7 Merge pull request #2572 from s0undt3ch/develop
Fix parser logging options not getting proper default values.
2012-11-15 13:58:53 -08:00
Pedro Algarvio
08e977b789 Fix parser logging options not getting proper default values. 2012-11-15 21:57:08 +00:00
David Boucha
be15907cc1 Merge pull request #2569 from mrtizmo/develop
Fixes #2464 check for i386 pkgs on 64bit systems
2012-11-15 13:10:31 -08:00
mrtizmo
01ab27cb87 Fixes #2464 check for i386 pkgs on 64bit systems
@UtahDave's fix was close; it appended the :arch instead of removing it to do the search within pkgs. I also generalized the case to fit arch's other than i386.
2012-11-15 16:05:31 -05:00
Thomas S Hatch
be76ac0f02 Merge pull request #2568 from techhat/release
Adding salt cloud notes to salt release notes
2012-11-15 12:27:51 -08:00
Thomas S Hatch
23496ff7f9 We should make all grains lookups in virtual functions passive 2012-11-15 13:23:55 -07:00
Joseph Hall
02f4159790 Adding salt cloud notes to salt release notes 2012-11-15 13:23:52 -07:00
Pedro Algarvio
1e4a4917ae Cast __version_info__ elements to int's. 2012-11-15 20:13:41 +00:00
Pedro Algarvio
99f29b92db Cast __version_info__ elements to int's. 2012-11-15 20:12:26 +00:00
Thomas S Hatch
eb8ef522c0 Merge pull request #2562 from kjkuan/develop
Doc updates and renderer fixes
2012-11-15 09:43:31 -08:00
Thomas S Hatch
4148d4d159 Clean up some formatting from 7d28fa0 #2558 2012-11-15 10:15:09 -07:00
Thomas S Hatch
f9972427ae Merge pull request #2558 from johnthedebs/develop
Add options to gem.install module and gem.installed state for version, ri, and rdoc
2012-11-15 09:13:25 -08:00
Thomas S Hatch
f3b044aee0 Fix #2559 2012-11-15 10:11:32 -07:00
Jack Kuan
0b9e5e1f9e Fix doc to align with last change. 2012-11-15 11:20:44 -05:00
David Boucha
a64d4317bd Merge pull request #2565 from UtahDave/develop
Some release notes additions.
2012-11-15 08:20:28 -08:00
David Boucha
cdf4c57298 Add note about Subversion module addition 2012-11-15 09:18:58 -07:00
David Boucha
b4c79dc022 Add note on gzip support
Gzip support added in cp.get_file and cp.get_dir
2012-11-15 09:09:32 -07:00
David Boucha
6fc1247def Merge pull request #2561 from giantlock/develop
fix type in docstring
2012-11-15 08:00:37 -08:00
David Boucha
37527b134a Merge pull request #2564 from UtahDave/develop
Spelling fixes. Grammar Fixes. Clarifications
2012-11-15 08:00:01 -08:00
David Boucha
aa7ee94ce7 Spelling fixes. Grammar Fixes. Clarifications 2012-11-15 08:58:04 -07:00
Jack Kuan
ad7f0f9b1f Changed my mind. Trying out the passing-file-object approach for template renderers. 2012-11-15 10:46:44 -05:00