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
7,079 Commits 24 Branches 182 Tags 341 MiB
154dbec554
Commit Graph

7079 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dave Boucha
154dbec554 Formatting and grammar fixes. 2012-10-22 16:53:21 -06:00
Dave Boucha
e52c27a230 Additions to 0.10.4 release notes. 2012-10-22 16:09:45 -06:00
Thomas S Hatch
4c561272a7 Fix problem where old master code may return a string 2012-10-22 13:41:35 -06:00
Thomas S Hatch
e210936afc Fix minor issue in tokens when the auth fails 2012-10-22 11:57:49 -06:00
Thomas S Hatch
cb272e94c0 Merge pull request #2313 from archtaku/develop 
Tolerate trailing whitespace in package metadata
 2012-10-22 10:47:13 -07:00
Erik Johnson
6e657b7987 Tolerate trailing whitespace in package metadata 
This is an addendum to pull req #2306 that will make _parse_pkg_meta()
tolerant of trailing whitespace, should there be any.
 2012-10-22 12:40:43 -05:00
Thomas S Hatch
2838273133 Merge branch 'develop' of github.com:saltstack/salt into develop 2012-10-22 11:40:00 -06:00
Thomas S Hatch
2f48f99329 Fix stack trace when auth fails 2012-10-22 11:39:38 -06:00
Thomas S Hatch
bc8725cdd0 Merge pull request #2312 from UtahDave/non_root_user 
Run salt-master as non-root user
 2012-10-22 10:16:07 -07:00
Dave Boucha
2b28a0d0cc Refix running master as non-root user 2012-10-22 11:10:17 -06:00
Thomas S Hatch
ed4e9bf708 Only check for SUDO_USER when looking for sudo 2012-10-22 10:54:05 -06:00
Dave Boucha
7c54097182 Merge branch 'develop' of github.com:saltstack/salt into non_root_user 2012-10-22 10:38:59 -06:00
Thomas S Hatch
a9baeb26d2 Make the root user track the master's user key 2012-10-22 10:36:42 -06:00
Thomas S Hatch
4814079ff5 Merge pull request #2307 from archtaku/yumpkg_file 
Add ability to install pkg from file (yumpkg)
 2012-10-22 08:36:14 -07:00
Dave Boucha
a7778110f4 Run master as non-root user 2012-10-22 00:15:09 -06:00
Erik Johnson
d74d2bf1c9 add missing "return {}" to error condition 2012-10-22 00:24:42 -05:00
Erik Johnson
adccb3378d Add ability to install pkg from file (yumpkg) 
This is my first attempt at extending yum support for anything, so it is
entirely possible I messed something up without realizing. I did however
test this on a Fedora 17 VM and it works there.
 2012-10-22 00:11:32 -05:00
Thomas S Hatch
85fe2de4c4 Merge pull request #2306 from archtaku/develop 
Add ability to install pkg from file (pacman)
 2012-10-21 21:35:44 -07:00
Erik Johnson
c576177b23 Add ability to install pkg from file (pacman) 2012-10-21 22:04:34 -05:00
Thomas S Hatch
808091d1f4 Merge pull request #2293 from vbulax/patch-1 
Update salt/grains/core.py
 2012-10-21 13:16:00 -07:00
Thomas S Hatch
2f34ac1eca Merge pull request #2305 from gcw/develop 
minor typo fixes in documentation
 2012-10-20 17:02:33 -07:00
G. Clifford Williams
aacdf24aca minor typo fixes 2012-10-20 18:10:18 -05:00
Seth House
42b4784bb2 Merge pull request #2303 from gcw/develop 
conflict resolved..
 2012-10-20 12:14:34 -07:00
G. Clifford Williams
a4c0963340 fix missed merge error 2012-10-20 13:17:48 -05:00
G. Clifford Williams
607dab0e71 Merge branch 'develop' of https://github.com/saltstack/salt into develop 
resolution of documentation merge with upstream develop branch
 2012-10-20 13:13:59 -05:00
G. Clifford Williams
d399da4259 Merge branch 'master' of https://github.com/saltstack/salt into develop 
Conflicts:
	doc/ref/renderers/all/index.rst
 2012-10-20 11:54:50 -05:00
Thomas S Hatch
5777927e98 Add os detection for SmartOS to grains 2012-10-19 22:31:07 -06:00
Thomas S Hatch
4c8a4b2191 Fix RabbitMQ tests where we can be a little less specific 2012-10-19 15:20:31 -06:00
Thomas S Hatch
ebfb9533ea Merge pull request #2299 from FireHost/ovs_oel_os_family_redhat 
Move OVS and OEL to the RedHat os_family
 2012-10-19 12:35:20 -07:00
David Boucha
9194c21171 Merge pull request #2298 from FireHost/centos_os_grain_fix 
Add 'centoslinu' to _os_name_map
 2012-10-19 11:39:16 -07:00
Aaron Tygart
74a5cf7a09 Move OVS and OEL to the RedHat os_family 2012-10-19 13:26:55 -05:00
Aaron Tygart
6952d4a72f Add 'centoslinu' to _os_name_map 2012-10-19 12:41:51 -05:00
David Boucha
01aa1f4914 Merge pull request #2292 from scott-w/develop 
Add RabbitMQ States
 2012-10-19 09:23:04 -07:00
Vadim Bulax
4520fa9a79 Update salt/grains/core.py 
Resolves grains conflict. 
grains['host'] in os_data() rewrites grains['host'] in hostname()
 2012-10-19 19:57:00 +04:00
Scott Walton
e7ea808701 Merge remote-tracking branch 'upstream/develop' into develop 2012-10-19 16:28:55 +01:00
Scott Walton
3b23817559 Fixed tests for supervisor and rabbitmq #962 2012-10-19 16:28:38 +01:00
Scott Walton
9a0fe34e9a Some clean-up, and tests for #962 2012-10-19 16:07:31 +01:00
David Boucha
9c47af807b Merge pull request #2289 from jonasvp/postgres_quote_bugfix 
Escape brackets in postgres modules as well
 2012-10-19 07:25:01 -07:00
Scott Walton
becb5afb45 Added absent states #962 2012-10-19 15:24:38 +01:00
Scott Walton
e823a73154 Remove redundant todo 2012-10-19 15:11:42 +01:00
Scott Walton
42d06a728c Clarified list_users 2012-10-19 15:11:18 +01:00
Scott Walton
ebfccdb7a2 Formatting 2012-10-19 15:09:46 +01:00
Scott Walton
0bd81e5ae6 Added support for managing virtual hosts #962 2012-10-19 15:05:35 +01:00
Scott Walton
723c8b50fb Extraneous ' 2012-10-19 12:09:03 +01:00
Scott Walton
a0d82ad77c Added extra modules to do some higher-level logic against rabbitmq #962 2012-10-19 12:08:19 +01:00
Scott Walton
b7ed775a07 Grammar 2012-10-19 11:42:32 +01:00
Scott Walton
340616a379 Added test framework for rabbitmq user #962 2012-10-19 11:42:01 +01:00
Scott Walton
4babc25f07 Added user exists state #962 2012-10-19 10:55:28 +01:00
Scott Walton
33c1a0c168 Fix module support, and started state support #962 2012-10-19 10:37:10 +01:00
Jonas
e6c4e4649b Escape brackets in postgres modules as well 
Fixes #2279
 2012-10-19 10:19:22 +02:00