valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
10,462 Commits 24 Branches 182 Tags 341 MiB
1fe0015c90
Commit Graph

10462 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pedro Algarvio
3d3f22ea8a Update the remaining parsers to use MergeConfigMixIn. Refs #2563. 2013-01-29 17:29:09 +00:00
Thomas S Hatch
a6df51ab1a Fix test failure due to update in the default nested outputter 2013-01-29 10:23:22 -07:00
Pedro Algarvio
8187e96826 Re-factored cli options merging with the config into it's own mix-in. Refs #2563. 
This will be useful in `salt-cloud` which copied this functionality over.
 2013-01-29 17:23:22 +00:00
Thomas S Hatch
a58202c2f7 Add compound matcher tests 2013-01-29 10:20:02 -07:00
Thomas S Hatch
193a64e33e Add check for bad not eval in compound matcher 2013-01-29 10:16:37 -07:00
Michael Lustfield
f827ac2101 Added rcS to modules/debian_service.py get_enabled(). 2013-01-29 11:09:31 -06:00
Thomas S Hatch
cf06b34125 Fix issues with resolve_dns change 2013-01-29 09:35:07 -07:00
David Boucha
d9788f3977 Merge pull request #3465 from s0undt3ch/hotfix/git-describe-single-call 
Support git describe versioning on windows and also one less subprocess. Refs #3461.
 2013-01-29 08:19:26 -08:00
Joseph Hall
5d71392a06 Merge pull request #3494 from giantlock/develop 
fix markup in docstring
 2013-01-29 08:06:49 -08:00
Pedro Algarvio
f872195062 Improved git describe exception handling. 
Previously we were catching the same exception in two places because on Windows the `child_traceback` attribute is not set on the exception, so, the initial exception catching we had was just working properly on Linux. Now we just check for the proper `errno` value, if it's not 2(The system cannot find the file specified), we still raise the exception so we can properly fix and handle it.
 2013-01-29 12:19:46 +00:00
Denis Generalov
ea3d262735 fix markup in docstring 2013-01-29 15:28:42 +04:00
Thomas S Hatch
6116d20ea0 Merge pull request #3493 from archtaku/issue3492 
fix refs to pkg.compare
 2013-01-28 22:29:22 -08:00
Erik Johnson
fb2cb3f552 fix refs to pkg.compare 2013-01-29 00:24:21 -06:00
Thomas S Hatch
76f32d1a15 Merge pull request #3491 from archtaku/issue3488 
fix apt.py refresh_db (issue #3488)
 2013-01-28 21:52:42 -08:00
Erik Johnson
ed3af46308 fix apt.py refresh_db (issue #3488) 2013-01-28 23:11:47 -06:00
Thomas S Hatch
804fe7c766 Move dns resolution into the minion, fix #3402 2013-01-28 17:00:41 -07:00
Thomas S Hatch
b12564796d clean up some newlines 2013-01-28 16:56:28 -07:00
Thomas S Hatch
598d715d28 remove resolution of master ip from the config seq 2013-01-28 16:55:55 -07:00
Pedro Algarvio
7f18c0eb6a We can just catch OSError. 
See http://mail.python.org/pipermail/python-list/2009-November/558704.html
 2013-01-28 23:25:25 +00:00
Pedro Algarvio
e306e6302d Mimic WindowsError in linux to avoid errors. 2013-01-28 23:23:44 +00:00
Pedro Algarvio
0d3db03195 Don't fail on Windows if git is not installed or not on PATH. 2013-01-28 23:14:50 +00:00
Thomas S Hatch
af8cdb6196 Merge pull request #3487 from techhat/apt 
Adding file_list() and file_dict() to apt.py
 2013-01-28 14:08:23 -08:00
Thomas S Hatch
3c86a89fd9 Merge pull request #3486 from techhat/pacman 
Pacman doesn't use an rpm database
 2013-01-28 14:08:01 -08:00
Joseph Hall
194e285e25 Adding file_list() and file_dict() to apt.py 2013-01-28 15:02:17 -07:00
Joseph Hall
f7f2932c75 Pacman doesn't use an rpm database 2013-01-28 15:00:27 -07:00
Thomas S Hatch
8862195ed0 Merge pull request #3470 from s0undt3ch/hotfix/smf-manifest 
Add SMF manifest files to be used in SmartOS(At least).
 2013-01-28 13:47:45 -08:00
Joseph Hall
a7d3a344fe Merge pull request #3484 from UtahDave/develop 
Fix cassandra module. __salt__ doesn't exist yet
 2013-01-28 13:43:57 -08:00
David Boucha
2835937016 Fix cassandra module. __salt__ doesn't exist yet 2013-01-28 14:39:04 -07:00
David Boucha
3e8a9ad5f1 Merge pull request #3481 from techhat/yumpkg 
Adding file_list to yumpkg.py
 2013-01-28 12:51:26 -08:00
David Boucha
b9ed0c58a2 Merge pull request #3482 from techhat/pacman 
Adding file_list and file_dict to pacman.py
 2013-01-28 12:50:25 -08:00
Joseph Hall
00b7455e7d Return a dict instead of a list, for more flexibility 2013-01-28 15:46:14 -05:00
Joseph Hall
0bcb6fbdfb Adding file_list and file_dict to pacman.py 2013-01-28 13:41:47 -07:00
Joseph Hall
9687d706c2 Adding file_list to yumpkg.py 2013-01-28 15:24:57 -05:00
Joseph Hall
b2c835bb7a Merge pull request #3480 from UtahDave/develop 
Updated description of the two installers.
 2013-01-28 11:51:41 -08:00
David Boucha
517efd2c59 Updated description of the two installers. 2013-01-28 12:49:41 -07:00
Joseph Hall
cac17c044a Merge pull request #3479 from UtahDave/develop 
Updated docs to reflect installer locations
 2013-01-28 11:47:52 -08:00
David Boucha
4c32c9eb20 Updated docs to reflect installer locations 
64 bit installer location
32 bit installer location
 2013-01-28 12:45:59 -07:00
Pedro Algarvio
5e44395f5b require-all -> require_all fix. Changed to "Unstable" manifests. 
See for more info http://www.cuddletech.com/blog/pivot/entry.php?id=182
 2013-01-28 18:54:18 +00:00
Joseph Hall
60ad05a4a3 Merge pull request #3478 from cedwards/documentation 
updated freebsd install instructions to reflect port name change
 2013-01-28 10:19:21 -08:00
Pedro Algarvio
731ef71a26 Directory rename and manifest changes to include documentation link plus some formatting. 2013-01-28 18:16:41 +00:00
Christer Edwards
5216f4d59e updated freebsd install instructions to reflect port name change 2013-01-28 11:11:21 -07:00
David Boucha
9f35fc6107 Merge pull request #3477 from techhat/locate 
Adding module for locate
 2013-01-28 09:38:03 -08:00
Joseph Hall
bafcac21c4 Adding module for locate 2013-01-28 10:25:04 -07:00
Thomas S Hatch
d50825995d Merge pull request #3472 from techhat/altlinux 
Adding grains for ALT Linux
 2013-01-27 19:28:31 -08:00
Joseph Hall
019bf7bd0f Fixing lsb_distrib_release and lsb_distrib_codename 2013-01-27 19:56:24 -07:00
Joseph Hall
c450eb6745 Adding grains for ALT Linux 2013-01-27 19:45:59 -07:00
Pedro Algarvio
e3e8727f98 Add SMF manifest files to be used in SmartOS(At least). 2013-01-27 23:54:49 +00:00
Thomas S Hatch
23a5bb70b2 Merge pull request #3469 from archtaku/version_audit 
Prepare pkg providers for #3278
 2013-01-27 10:01:51 -08:00
Thomas S Hatch
b93a536785 Merge pull request #3467 from giantlock/develop 
fix some issues with pkg
 2013-01-27 10:00:14 -08:00
Erik Johnson
15e0324b3b Rework version comparison to be more user-friendly 
This commit touches a lot of files, but almost all of them refer back to
the common code written in pkg_resource.py.
 2013-01-27 03:28:38 -06:00