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
8,968 Commits 24 Branches 182 Tags 341 MiB
ce34e90181
Commit Graph

8968 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pedro Algarvio
8976bbe5ac Merge branch 'develop' of github.com:saltstack/salt into develop 2012-12-20 22:52:16 +00:00
Jeff Hutchins
4050753609 Revert "Improve modules check" 
This reverts commit 6a9f9fb51d.
 2012-12-20 15:51:46 -07:00
Pedro Algarvio
f0510e656d Fewer comments. Left the most important one in the proper place. Refs #2958. 2012-12-20 22:50:43 +00:00
Thomas S Hatch
1e3b6f1262 Merge pull request #2979 from s0undt3ch/develop 
Set linger on ZMQ sockets before closing
 2012-12-20 14:45:40 -08:00
Thomas S Hatch
5ca5a24442 Add whitelist capability to the loader, fix#2903 2012-12-20 15:45:28 -07:00
Jeff Hutchins
6a9f9fb51d Improve modules check 
There are actually two improvements here.
1) this.ko.bak and that.konan won't match anymore
2) Both lines become constant time opperations rather than having to seek from
   beggining to end of each string looking for the extension.
 2012-12-20 15:42:16 -07:00
Pedro Algarvio
40619a5b49 Set linger on ZMQ sockets before closing, stops issues with context.term() hanging indefinitely. Refs #2958. 
* Any unsent messages a socket which does not have `linger` set to a positive value, will make `context.term()` hang indefinitely. See https://github.com/zeromq/pyzmq/issues/102 for more info.
 2012-12-20 22:37:21 +00:00
Jeff Hutchins
107c265664 List modules that aren't in the kernel folder. 2012-12-20 15:23:39 -07:00
Thomas S Hatch
d19bf88a53 Add style guide to the toc 2012-12-20 14:17:39 -07:00
Joseph Hall
4c3e6d4a8d Merge pull request #2977 from cedwards/freebsd 
fixed typo s/locatime/localtime/
 2012-12-20 12:42:17 -08:00
Christer Edwards
ef9f3b603a fixed typo s/locatime/localtime/ 2012-12-20 13:38:18 -07:00
Thomas S Hatch
4043b976e9 Merge pull request #2976 from herlo/develop 
fixing typos is fun!
 2012-12-20 12:23:39 -08:00
Clint Savage
3cd8c56875 fixing typos is fun! 2012-12-20 13:22:17 -07:00
Thomas S Hatch
892a371b87 Fix #1775 by adding a coding style 2012-12-20 12:35:27 -07:00
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