valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
9,004 Commits 24 Branches 182 Tags 341 MiB
0255c8d583
Commit Graph

9004 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas S Hatch
beab5c5862 Merge pull request #2973 from seanchannel/develop 
both ways to add repo
 2012-12-20 11:31:19 -08:00
Sean Channel
8adee9532a both ways to add repo 2012-12-20 11:20:48 -08:00
Thomas S Hatch
e018689c38 Merge pull request #2971 from jhutchins/develop 
Fix mounting issue introduced by e01c3d52b1
 2012-12-20 10:42:30 -08:00
Jeff Hutchins
16bc496b11 Fix mounting issue introduced by e01c3d52b1 2012-12-20 11:36:44 -07:00
Thomas S Hatch
fdac2216fc Add some docs to service module, fix #1508 2012-12-20 11:16:38 -07:00
Thomas S Hatch
9d1015b836 Merge pull request #2941 from Talksum/rh_ip-jinjaloader 
change from jinja's PackageLoader to FileSystemLoader
 2012-12-20 09:56:58 -08:00
Joseph Hall
bb2ad117d3 Merge pull request #2970 from herlo/develop 
updated to 0.11.1 for security vulnerability fix
 2012-12-20 09:26:23 -08:00
Clint Savage
45b2eb1cc8 updated to 0.11.1 for security vulnerability fix 2012-12-20 10:24:41 -07:00
Thomas S Hatch
25aaabdd39 Merge pull request #2969 from nkuttler/doc_debian 
Update the incorrect Debian install information
 2012-12-20 08:34:30 -08:00
Thomas S Hatch
169c5314c4 Merge pull request #2968 from nkuttler/doc_fixes 
Fix three small typos
 2012-12-20 08:33:59 -08:00
Thomas S Hatch
51c39960fa Add version number of the minion to the auth error message 2012-12-20 09:25:12 -07:00
Nicolas Kuttler
947d40adf2 Update the incorrect Debian install information 2012-12-20 17:15:05 +01:00
Thomas S Hatch
d00cc81b57 Merge pull request #2962 from rizumu/0.11.0 
Match Arch's PKGBUILD files with those in the AUR (0.11.0 branch)
 2012-12-20 08:12:05 -08:00
Thomas S Hatch
7e684e92dd Merge pull request #2961 from rizumu/develop 
Match Arch's PKGBUILD files with those in the AUR (develop branch)
 2012-12-20 08:11:39 -08:00
Nicolas Kuttler
657878dcdc Add missing colons 2012-12-20 16:51:30 +01:00
Nicolas Kuttler
d422217aab Fix typo 2012-12-20 16:51:04 +01:00
Joseph Hall
c63eaa4724 Merge pull request #2966 from cedwards/freebsd 
added check for existing /etc/localtime before unlinking
 2012-12-20 07:38:26 -08:00
David Boucha
c33345ab09 Merge pull request #2967 from UtahDave/fix_0.11.1_release_notes 
Fix typos and grammar. Some clarifications
 2012-12-20 07:24:10 -08:00
David Boucha
90c073a2eb Fix typos and grammar. Some clarifications 2012-12-20 08:22:31 -07:00
Tor Hveem
230e9d599f Merge remote-tracking branch 'upstream/develop' into develop 2012-12-20 15:56:35 +01:00
Christer Edwards
d2fe1a69b7 added check for existing /etc/localtime before unlinking 2012-12-20 07:46:59 -07:00
rizumu
d06566ebd7 Match Arch's PKGBUILD files with those in the AUR 2012-12-20 10:49:03 +01:00
rizumu
df94ce9137 Match Arch's PKGBUILD files with those in the AUR 2012-12-20 10:48:34 +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
Mike Chesnut
c529d62fbe fixing os.path import and function use as mentioned in #2928 
thatch45 comment that we don't want to import the exists and join
functions into this module "bare" as they would then be totally
exposed to salt (and callable from salt, e.g., rh_ip.exists),
which we don't want.  this change fixes that and calls the functions
as os.path.exists and os.path.join instead.
 2012-12-19 14:24:22 -08:00
Mike Chesnut
456e4f51f4 coding style changes for issue #2941 
- update import os and use os.sep
- import the specific jinja2.exceptions exception and catch it by
  name rather than catching generic "Exception"
 2012-12-19 14:19:54 -08: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