Commit Graph

12055 Commits

Author SHA1 Message Date
Thomas S Hatch
2c0f79df57 Add valid_url function 2013-04-05 16:09:17 -06:00
Thomas S Hatch
d13493cc6a Merge pull request #4400 from basepi/supgroups
Compare sorted supplemental groups
2013-04-05 15:12:16 -07:00
Colton Myers
7bc7900f93 Compare sorted supplemental groups 2013-04-05 15:53:41 -06:00
Thomas S Hatch
1717766af0 SINGLE QUOTES :) 2013-04-05 15:51:35 -06:00
Thomas S Hatch
3035822177 Add a routine to test retcode 2013-04-05 15:07:32 -06:00
Thomas S Hatch
44099692a0 Add redcode logic to salt-call 2013-04-05 15:03:10 -06:00
Thomas S Hatch
440345db85 Merge pull request #4398 from timhollinger/develop
Improved readability, grammar
2013-04-05 13:55:11 -07:00
Tim Hollinger
96fa0c48f9 Changed to 3rd person
Changed to 3rd person
2013-04-05 14:52:51 -06:00
Thomas S Hatch
6dbfc2f2aa Consolidate the syndic
The syndic was setting up a number of minion constructs that it does
not need, this commit strips them out and simplifies the syndic
2013-04-05 14:46:07 -06:00
Thomas S Hatch
fb62121c28 Remove iter events stuff from client 2013-04-05 14:46:07 -06:00
Colton Myers
f457c23683 Add link to issue from pep8 2013-04-05 14:29:48 -06:00
Thomas S Hatch
7be4259ed8 Merge pull request #4399 from basepi/stylefixes
Add pep8 'fixing' instructions to style guide
2013-04-05 13:24:47 -07:00
Colton Myers
a7b7c97506 Fix typos and add more clarification 2013-04-05 14:22:34 -06:00
Tim Hollinger
98ca53c218 Fixed 80 column width
Due to fussy programmers that still live with 1972 standards :P
2013-04-05 14:20:36 -06:00
Colton Myers
815be866d3 Add documentation to 'fix' pep8 and flake8 2013-04-05 14:11:32 -06:00
Tim Hollinger
164e3c796f Improved readability, grammar
Swapped 'a' for 'an' where necessary.  Changed verb agreement.
Uncluttered scentences.
2013-04-05 13:49:51 -06:00
Thomas S Hatch
61512f715e Merge pull request #4396 from basepi/gitfix4324
Set supplemental groups for 'runas' in cmdmod.py
2013-04-05 12:01:07 -07:00
Thomas S Hatch
9ea128050e Last time I edit on github directly 2013-04-05 12:46:08 -06:00
Thomas S Hatch
1af88122ed Add code_block decs 2013-04-05 12:45:12 -06:00
Thomas S Hatch
5e8ec2c9a7 Add indent style stuff 2013-04-05 12:43:00 -06:00
Colton Myers
60b55cea56 Set supplemental groups in _chugid (for runas) 2013-04-05 12:23:22 -06:00
Colton Myers
04859eb898 Add docstring and PEP8 Fixes
Because I know how much Tom loves to see PEP8 fixes in pull reqs
2013-04-05 11:05:30 -06:00
Thomas S Hatch
09a2d5121b Merge pull request #4393 from giantlock/develop
fix unit tests
2013-04-05 08:51:32 -07:00
Thomas S Hatch
f2be57ac4f Merge pull request #4391 from torhve/develop
Improve nested outputter to check all number types
2013-04-05 08:40:45 -07:00
Thomas S Hatch
cb82d7307c Fix issue with MasterExit being in salt.master.py 2013-04-05 09:23:22 -06:00
Thomas S Hatch
7858dc8c16 Merge pull request #4387 from terminalmage/issue4295
Use __context__ to reduce calls to chkconfig/runlevel
2013-04-05 08:17:00 -07:00
Thomas S Hatch
2ebda8f820 Merge pull request #4386 from terminalmage/issue4383
Make user.info return an empty dict when user not present
2013-04-05 08:16:00 -07:00
Thomas S Hatch
e4fce9a576 Merge pull request #4392 from whiskybar/patch-1
fixed a typo
2013-04-05 07:53:59 -07:00
Denis Generalov
2511d2bb28 Merge branch 'develop' of github.com:giantlock/salt into develop 2013-04-05 18:22:07 +04:00
Denis Generalov
1b1a5bd743 fix unit tests 2013-04-05 18:21:33 +04:00
Denis Generalov
ed1dde4128 fix unit tests 2013-04-05 17:59:29 +04:00
Joseph Hall
ead7e4a77b Merge pull request #4388 from giantlock/develop
fix pgpassfile removing
2013-04-05 06:12:42 -07:00
Jiri Barton
6332202036 fixed a typo
a typo with consequences clearly
2013-04-05 15:04:06 +03:00
Tor Hveem
af7e3d2211 Improve nested outputter to check all number types 2013-04-05 13:54:48 +02:00
Denis Generalov
bd5bf09cac Merge branch 'develop' of https://github.com/saltstack/salt into develop 2013-04-05 10:00:57 +04:00
Erik Johnson
4ea667a105 Use __context__ to reduce calls to chkconfig/runlevel
This commit uses the __context__ dict to keep
salt.modules.rh_service._services() from running chkconfig --list and
runlevel every time it is called (which is often). The service.running
and service.dead states will clear the context data before trying to
detect changes.

This fixes #4295.
2013-04-04 23:36:22 -05:00
Erik Johnson
fd5ccb3ad0 Update refs to user.info
In 266b86a, user.info was changed in all the user providers to return an
empty dict if the user passed to it was not present. This commit updates
the refs in salt.modules.ssh so that they use dict.get (or check if the
return data from user.info resolves to False) where appropriate.

There are a few remaining refs in salt.states.user.present, but in all
of those remaining cases the user.info function is only run in instances
where the user already exists.
2013-04-04 22:51:02 -05:00
Erik Johnson
266b86a492 Make user.info return {} if user not present
This change has been made in all four user providers.
2013-04-04 22:30:30 -05:00
Thomas S Hatch
6b944f05cf Merge pull request #4385 from giantlock/7def5edf630e04b886aeaa93cf0867a42e83717e
Some fixes for postgres module
2013-04-04 17:28:13 -07:00
Thomas S Hatch
a4863e0d1d kill stray print 2013-04-04 18:21:15 -06:00
Thomas S Hatch
739056eac1 Ref the local client instance when gathering event data 2013-04-04 18:20:07 -06:00
Thomas S Hatch
6d9d00c44c Make gen_event get ful returns 2013-04-04 18:18:58 -06:00
Denis Generalov
4d4f6f4b30 do remove PGPASSFILE only when password is set 2013-04-05 04:03:01 +04:00
Denis Generalov
42278618e5 Merge branch 'develop' of https://github.com/saltstack/salt into develop 2013-04-05 03:57:33 +04:00
Thomas S Hatch
6540636d87 This breaks the syndic, but fixes the tests
This also adds the code needed to get the syndic going again.
2013-04-04 17:52:52 -06:00
Denis Generalov
7def5edf63 * fix bug in _run_psql() with password handling
* use password through PGPASSFILE file
* fix checking maintenance_db and runas params: '' and None is equal
* fix bug with escaping in psql_query(), hope default delemiter and quote is enough
* psql_query() now returns list instead of dict, just according table nature
* add gathering tablespace parameter of databases in db_list()
* remove `locale` argument of db_create(), which is probably obsolete
* add db_alter() function for changing db parameters
* present() state now tries to fix db params if it's needed and possible
  (what we disscussed in issue #4164)
* fix pep8, formatting and double quotes
2013-04-05 03:40:35 +04:00
Thomas S Hatch
f05aff899a Merge pull request #4382 from basepi/userfix
Fix user.info to always return a list
2013-04-04 15:56:58 -07:00
Colton Myers
862499073d Fix user.info to always return a list 2013-04-04 16:56:06 -06:00
Thomas S Hatch
c009b08dfb Merge pull request #4380 from memotype/develop
fix debian/control to use python2.6
2013-04-04 14:56:17 -07:00
Thomas S Hatch
7902728562 Merge pull request #4379 from basepi/maxdepth2788
Add maxdepth parameter to file.recurse state
2013-04-04 14:54:30 -07:00