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
7,952 Commits 24 Branches 182 Tags 341 MiB
030ac57c66
Commit Graph

7952 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
dekehn
030ac57c66 Merge remote-tracking branch 'upstream/develop' into HEAD 2012-11-16 17:19:41 -07:00
dekehn
e32bcccb31 fixed a merge issue 2012-11-16 17:13:48 -07:00
David Boucha
231854fdc5 Merge pull request #2599 from l2ol33rt/fix_docs 
Added documentation to cmd state
 2012-11-16 16:12:33 -08:00
David Boucha
0b37ddc6a0 Merge pull request #2596 from kuerzn/develop 
Fix for #2595. replace merge with pull for better git compatibility.
 2012-11-16 16:08:55 -08:00
David Boucha
892282a7d8 Merge pull request #2597 from s0undt3ch/develop 
Fix `stateconf` test failing in 2.6 because `OrderedDict` was not available.
 2012-11-16 16:06:25 -08:00
Robert Hernandez
6121f62ba3 Added documentation to cmd state 2012-11-16 15:25:43 -08:00
Pedro Algarvio
89fd313766 Fix stateconf test failing in 2.6 because OrderedDict was not available. 2012-11-16 22:45:12 +00:00
Pedro Algarvio
11792f34a4 More PEP-8 2012-11-16 22:32:10 +00:00
Pedro Algarvio
911b837405 Merge branch 'develop' of github.com:saltstack/salt into develop 2012-11-16 22:23:03 +00:00
Pedro Algarvio
dc5b8b7109 Double to single quotes, .format() and PEP-8 changes. 2012-11-16 22:20:41 +00:00
Kuerzn
dacf38a808 Fix for #2595. replace merge with pull for better git compatibility. 
Also check, if REV already in repository. If not, fetch it before checking it out!
 2012-11-16 23:19:02 +01:00
Thomas S Hatch
d58d5be290 Merge pull request #2595 from kuerzn/develop 
Fix for #2582. Replaced git-pull with git-fetch; git-merge FETCH_HEAD.
 2012-11-16 13:39:46 -08:00
Kuerzn
bccaa0972d Fix for #2582. Replaced git-pull with git-fetch; git-merge FETCH_HEAD. Where the merge only happens, if there is a branch currently checked out. The whole function still needs to be checked for consistency in all tests and log messages 2012-11-16 22:27:22 +01:00
Thomas S Hatch
cdd09b9d1e Merge pull request #2590 from UtahDave/fix_2220_non-root_master 
Fixes #2220 Add the pki directory to verify_env on salt-key
 2012-11-16 11:07:58 -08:00
David Boucha
8b334494e8 Merge pull request #2589 from s0undt3ch/develop 
Fix `integration.shell.cp.CopyTest.test_cp_testfile`
 2012-11-16 10:43:17 -08:00
Seth House
5b0abf59eb Added / updated targets for the acl and eauth docs 2012-11-16 11:21:51 -07:00
David Boucha
136134d02a Add the pki directory to verify_env on salt-key 2012-11-16 11:14:50 -07:00
Seth House
25b7992052 Added target to the eauth doc 2012-11-16 11:12:47 -07:00
Pedro Algarvio
8efd10dd6a Merge branch 'develop' of github.com:saltstack/salt into develop 2012-11-16 18:10:26 +00:00
Pedro Algarvio
52b0c1ba8e Adapt cherry-picked 2dd188fa18abff3193450472af2192206907b3ba to the new output shell switch. 2012-11-16 18:01:01 +00:00
Pedro Algarvio
ee32784bb4 Make the salt-cp shell test case work across multiple machines. 2012-11-16 18:00:51 +00:00
Thomas S Hatch
f89e3e9edf Merge pull request #2584 from UtahDave/fix_2583_mysql.py 
Fixes #2583 Remove check for configs. Only check for libraries
 2012-11-16 09:14:06 -08:00
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
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
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