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,980 Commits 24 Branches 182 Tags 341 MiB
f3374741cf
Commit Graph

7980 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas S Hatch
f3374741cf Add cp.get_file_str to fix #2604 2012-11-16 20:20:08 -07:00
Thomas S Hatch
61b5fb7fcd Merge pull request #2605 from kjkuan/develop 
Make the yaml renderer raise a SaltRenderError
 2012-11-16 18:32:40 -08:00
Jack Kuan
105ed7f700 Make the yaml renderer raise a SaltRenderError when used with option -o 
but no OrderedDict is available.
 2012-11-16 21:23:46 -05:00
Pedro Algarvio
bed55506c3 Proper OrderedDict check. 2012-11-17 01:19:37 +00:00
David Boucha
91230f0c82 Merge pull request #2603 from UtahDave/develop 
Fix indent error
 2012-11-16 16:59:14 -08:00
David Boucha
79bd9ff614 Fix indent error 2012-11-16 17:56:11 -07:00
David Boucha
cda5c8201a Merge pull request #2601 from dkehn/fix_mysql.py 
Fix mysql.py
 2012-11-16 16:38:36 -08:00
Thomas S Hatch
259747b084 Merge pull request #2598 from s0undt3ch/cherry-pick/CLOEXEC 
Fix #2509
 2012-11-16 16:38:19 -08:00
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
Pedro Algarvio
bf1c77446a Merge branch 'develop' of github.com:saltstack/salt into cherry-pick/CLOEXEC 2012-11-16 23:59:34 +00:00
Robert Hernandez
6121f62ba3 Added documentation to cmd state 2012-11-16 15:25:43 -08:00
Pedro Algarvio
a17d213d59 Fix stateconf test failing in 2.6 because OrderedDict was not available. 2012-11-16 22:53:58 +00:00
Pedro Algarvio
efc9a390bd More PEP-8 2012-11-16 22:53:38 +00:00
Pedro Algarvio
9110340490 Double to single quotes, .format() and PEP-8 changes. 2012-11-16 22:52:07 +00: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
Pedro Algarvio
4023a9d1af Merge branch 'develop' of github.com:saltstack/salt into cherry-pick/CLOEXEC 2012-11-16 21:00:57 +00: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
Pedro Algarvio
b1de88ced5 Merge branch 'develop' of github.com:saltstack/salt into cherry-pick/CLOEXEC 2012-11-16 18:44:44 +00: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
Pedro Algarvio
2da1380d6d Adapt cherry-picked 2dd188fa18abff3193450472af2192206907b3ba to the new output shell switch. 2012-11-16 17:15:39 +00:00
Pedro Algarvio
5626bb6f46 Make the salt-cp shell test case work across multiple machines. 2012-11-16 17:14:43 +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
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