valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
5,214 Commits 24 Branches 182 Tags 341 MiB
f914e6df12
Commit Graph

5214 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas S Hatch
f914e6df12 fix some issues in the event module 2012-06-30 17:48:24 -06:00
Thomas S Hatch
9169f7c067 repair checks in minion event master code 2012-06-30 17:40:29 -06:00
Jeff Schroeder
be72db75c7 Fix an exc when msgpack and msgpack_pure don't exist 
@herlo found this one gawd knows how
 2012-06-30 16:31:59 -07:00
Thomas S Hatch
4a4c8d08a8 Merge pull request #1541 from greghaynes/develop 
Allow setting group and user perms for file state independently
 2012-06-30 16:28:45 -07:00
Gregory Haynes
0ae49510cf Allow setting group and user perms for file state independently 2012-06-30 16:15:31 -07:00
Thomas S Hatch
7a2973a10a Merge pull request #1540 from s0undt3ch/master 
Improved logging stuff
 2012-06-30 15:57:40 -07:00
Thomas S Hatch
3ded1f5e4f Merge pull request #1539 from dcolish/develop 
Use tempdir to ensure there will always be a directory for states.cmd tests
 2012-06-30 15:53:00 -07:00
Dan Colish
ede8d4e027 Merge branch 'develop' of git://github.com/saltstack/salt into develop 2012-06-30 15:48:56 -07:00
Dan Colish
e767d25a5e Use tempdir to ensure there will always be a directory which can be accessed. 2012-06-30 15:48:28 -07:00
Thomas S Hatch
0f7734a899 Merge pull request #1538 from dcolish/develop 
Allow user.getent on OSX
 2012-06-30 15:43:52 -07:00
Dan Colish
5504c79365 Merge branch 'develop' of git://github.com/saltstack/salt into develop 2012-06-30 15:42:53 -07:00
Dan Colish
88281d143c Allow user.getent on OSX 2012-06-30 15:42:32 -07:00
Pedro Algarvio
3f6b4ac7b8 Improved logging configuration options from the configuration files. 
* Added the ability to configure the log levels for the console logger separate from the logfile logger. The log level provided from the cli script will override the console log level set on the configuration file but not the logfile logger setting, unless theres no setting for the logfile setting in which case it will be the same as the console log level.
* Added the ability to provide the logging formats for both the console and the logfile.
* Added the ability to provide the date format to be used.
* The module name formatting("%(name)s") now remembers the widest name, this will improve log readability.
* Also catch `KeyboardInterrupt`s while the minion is waiting to connect to the master and not just on `minion.tune_in()`.

All these new configuration settings are documented on the configuration file templates.
 2012-06-30 23:40:03 +01:00
Thomas S Hatch
0a83e68e1a Merge pull request #1537 from dcolish/develop 
Fix state.file tests and unit.utils.find_tests.
 2012-06-30 15:28:31 -07:00
Thomas S Hatch
756d358e95 Merge pull request #1536 from laprice/develop 
fixing the salt/tests/integration/states/cmd.py test
 2012-06-30 15:28:01 -07:00
Dan Colish
040c249866 Fix find_test on OSX 2012-06-30 15:23:50 -07:00
Dan Colish
b41bf2f434 Merge branch 'develop' of git://github.com/saltstack/salt into develop 2012-06-30 15:21:13 -07:00
Dan Colish
982ff3e462 Fix file state tests on OSX. 2012-06-30 15:20:52 -07:00
Thomas S Hatch
3aa93ba14b Merge pull request #1535 from jhutchins/tests 
Tests
 2012-06-30 15:15:01 -07:00
Jeff Hutchins
b380991316 Merge git://github.com/saltstack/salt into tests 
Conflicts:
	tests/unit/utils/find_test.py
 2012-06-30 15:58:17 -06:00
Jeff Schroeder
5e85497760 Gracefully skip the django module tests w/o mock 2012-06-30 14:53:55 -07:00
Jeff Schroeder
94ec7d4816 Make an error go to stderr and remove net 1 LOC 2012-06-30 14:53:32 -07:00
Thomas S Hatch
0cc8e45a7e Merge pull request #1534 from whiteinge/doc-blurb 
Yet another attempt at a marketing blurb that doesn't annoy people
 2012-06-30 14:43:02 -07:00
Seth House
edcbb72741 Updated the marketing blurb with something less buzzword-heavy 2012-06-30 14:36:43 -07:00
Thomas S Hatch
8ba1d51a75 Merge pull request #1533 from mattrobenolt/django-module-tests 
Added tests for Django module
 2012-06-30 14:33:16 -07:00
Thomas S Hatch
ede600a734 Merge pull request #1532 from akoumjian/develop 
Fix for minion KeyError 1523
 2012-06-30 14:27:40 -07:00
Matt Robenolt
aea679801f Django commands should all internally call the generic "command" function 2012-06-30 14:25:25 -07:00
Alec Koumjian
40781ea0ae Fix for minion KeyError 1523 2012-06-30 14:25:14 -07:00
Matt Robenolt
d327e6bdf4 Adding tests for Django module commands 2012-06-30 14:24:22 -07:00
Thomas S Hatch
f0073bc5dd Merge pull request #1531 from dcolish/develop 
Skip verify_env test on windows.
 2012-06-30 14:13:02 -07:00
Dan Colish
1b1431ba66 Skip verify_env test on windows. 2012-06-30 14:11:37 -07:00
Thomas S Hatch
ed84eda01f Merge pull request #1530 from dcolish/develop 
Fix test.integration.states.host. Make master_config and minion_config a...
 2012-06-30 14:03:56 -07:00
Jeff Schroeder
9d2a749319 Merge pull request #1422 from kvelarde/develop 
First monit module commit
 2012-06-30 14:00:20 -07:00
Dan Colish
c5cdb366dc Fix test.integration.states.host. Make master_config and minion_config a property to keep semantics consistent 2012-06-30 13:54:23 -07:00
Jeff Hutchins
ff54029c98 Make tests on utils.find run with nose. 2012-06-30 14:48:40 -06:00
Jeff Schroeder
6950d296a6 Merge pull request #1529 from drd/develop 
Create skeletal HACKING file
 2012-06-30 13:36:20 -07:00
Eric O'Connell
53ea031a72 Create skeletal HACKING file 2012-06-30 13:31:38 -07:00
Thomas S Hatch
d15899ce20 Merge pull request #1528 from dcolish/develop 
Add unittests for salt.utils.verify
 2012-06-30 13:30:36 -07:00
Thomas S Hatch
98094e682c Merge pull request #1527 from laprice/develop 
initial version of states/user.py and adding states to default runtests.py
 2012-06-30 13:29:43 -07:00
Dan Colish
ef523b02f0 Merge branch 'develop' of git://github.com/saltstack/salt into develop 2012-06-30 13:29:10 -07:00
Dan Colish
01b74fc04c Add unittests for salt.utils.verify 2012-06-30 13:28:15 -07:00
Thomas S Hatch
7e4c10d0c0 Merge pull request #1526 from UtahDave/fix_setup.py 
import setuptools if SETUPTOOLS  env var exists
 2012-06-30 13:09:41 -07:00
David Boucha
7d89ee3783 import setuptools if SETUPTOOLS env var exists 
Default to importing distutils unless the user
has created an environment variable named
SETUPTOOLS in which case import setuptools
 2012-06-30 14:01:57 -06:00
Thomas S Hatch
2fa09e0c03 Merge pull request #1524 from dcolish/develop 
Move tmp hosts file management to test case which requires it. Fix
 2012-06-30 12:47:01 -07:00
Dan Colish
edfb3d2560 Merge branch 'develop' of git://github.com/saltstack/salt into develop 
Conflicts:
	tests/unit/utils/find_test.py
 2012-06-30 12:46:04 -07:00
Thomas S Hatch
582d0e15fe Merge branch 'develop' of github.com:saltstack/salt into develop 2012-06-30 13:42:00 -06:00
Thomas S Hatch
27b5da0f82 initial addition of event system minion module 2012-06-30 13:41:14 -06:00
Thomas S Hatch
e285aa8d5c change msg to data for consistency 2012-06-30 13:40:43 -06:00
Jeff Schroeder
7e16fd680a Merge branch 'develop' of github.com:saltstack/salt into develop 2012-06-30 12:34:41 -07:00
Jeff Schroeder
07b4c8b4ed Skip the rvm and gem module/state tests when mock is missing 
The mock python module is required for the gem and rvm tests.
If it is not available, the tests should be gracefully skipped.

From python runtests.py -u:

test__check_and_install_ruby (unit.states.rvm_test.TestRvmState) ... skipped 'mock python module is unavailable'
test__check_ruby (unit.states.rvm_test.TestRvmState) ... skipped 'mock python module is unavailable'
test__check_rvm (unit.states.rvm_test.TestRvmState) ... skipped 'mock python module is unavailable'
test_gemset_present (unit.states.rvm_test.TestRvmState) ... skipped 'mock python module is unavailable'
test_installed (unit.states.rvm_test.TestRvmState) ... skipped 'mock python module is unavailable'
test_installed (unit.states.gem_test.TestGemState) ... skipped 'mock python module is unavailable'
test_removed (unit.states.gem_test.TestGemState) ... skipped 'mock python module is unavailable'
test__rvm (unit.modules.rvm_test.TestRvmModule) ... skipped 'mock python module is unavailable'
test__rvm_do (unit.modules.rvm_test.TestRvmModule) ... skipped 'mock python module is unavailable'
test_gemset_list (unit.modules.rvm_test.TestRvmModule) ... skipped 'mock python module is unavailable'
test_gemset_list_all (unit.modules.rvm_test.TestRvmModule) ... skipped 'mock python module is unavailable'
test_install (unit.modules.rvm_test.TestRvmModule) ... skipped 'mock python module is unavailable'
test_list (unit.modules.rvm_test.TestRvmModule) ... skipped 'mock python module is unavailable'
test__gem (unit.modules.gem_test.TestGemModule) ... skipped 'mock python module is unavailable'
test_list (unit.modules.gem_test.TestGemModule) ... skipped 'mock python module is unavailable'
test_sources_list (unit.modules.gem_test.TestGemModule) ... skipped 'mock python module is unavailable'
 2012-06-30 12:29:48 -07:00