valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
10,785 Commits 24 Branches 182 Tags 341 MiB
0affb35ef4
Commit Graph

10785 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Boucha
cf7d6f55ec bump version to 0.12.1 2013-02-10 14:41:41 -07:00
David Boucha
56cb40878b remove unneeded import 2013-02-10 14:20:08 -07:00
David Boucha
65dc92339b Add winapi context manager to win_network 2013-02-10 12:51:26 -07:00
David Boucha
43db3aedb1 Shorten import line length 2013-02-10 12:44:19 -07:00
David Boucha
7f79c26323 Add winapi context manager _windows_platform_data 2013-02-10 12:41:59 -07:00
David Boucha
ed528baa0b Add wmi winapi import 2013-02-10 12:40:10 -07:00
David Boucha
08677d44c9 Import standard Salt file module functions 2013-02-10 12:31:03 -07:00
David Boucha
209c566010 Add @vlaci's idea to manage wmi 2013-02-10 12:24:48 -07:00
Thomas S Hatch
fd41fa52b2 Merge pull request #3662 from kjkuan/pydsl_merge_fix 
Fix the merge conflicts in tests/unit/pydsl_test.py
 2013-02-09 21:49:45 -08:00
Jack Kuan
ede7d9a762 Added doc for render time state execution and also fixed a bug with the feature. 2013-02-10 00:37:31 -05:00
Jack Kuan
fa7e327baf Fix the merge conflicts in tests/unit/pydsl_test.py 2013-02-09 21:28:35 -05:00
Thomas S Hatch
e5ec9507ce Catch some regex potential stack traces 2013-02-09 15:52:47 -07:00
Thomas S Hatch
a6244d6b2b Fix for #3629 
An invalid regex in the client_acl or external_auth would cause the master
to crash
 2013-02-09 15:36:38 -07:00
Thomas S Hatch
3aecfced3e Merge pull request #3660 from seanchannel/develop 
new release + minor postrm fix
 2013-02-09 14:21:56 -08:00
Thomas S Hatch
f65626db0b Update pydsl tests, still failing though 2013-02-09 15:07:59 -07:00
Sean Channel
ddc91bfa49 update release in changelog 2013-02-09 14:06:14 -08:00
Sean Channel
cd29307a9f do not force rm of conf files 2013-02-09 14:03:01 -08:00
Thomas S Hatch
e63a01f853 Add docstring 2013-02-09 14:41:16 -07:00
Thomas S Hatch
ace2aade9f Fix binary file issue from merge 2013-02-09 14:40:31 -07:00
Thomas S Hatch
858e86d597 Merge branch 'pydsl_compile_time_state_execution' of git://github.com/kjkuan/salt into kjkuan-pydsl_compile_time_state_execution 
Conflicts:
	tests/unit/pydsl_test.py
 2013-02-09 14:31:36 -07:00
Thomas S Hatch
9800bd82ca Fix #3659 2013-02-09 14:16:43 -07:00
Seth House
231e17d610 Minor rST fixes 2013-02-08 21:02:41 -07:00
Thomas S Hatch
a8797b74db Make it so that the reactor option in the master config 
can point to a file that gets reloaded all the time with the
reactor configuration
 2013-02-08 18:29:25 -07:00
Thomas S Hatch
0bcc2a491b Merge pull request #3656 from UtahDave/fix_mysql 
Fixes #3653 Stop MySQLdb from converting to python objects.
 2013-02-08 14:59:39 -08:00
Thomas S Hatch
a143fda79d Don't fail on auth retries, they are called retry for a reason 2013-02-08 15:52:34 -07:00
David Boucha
be1ccf6496 Stop MySQLdb from converting to python objects. 2013-02-08 15:49:40 -07:00
Jack Kuan
106cc0aa0e Move the pydsl module into salt/utils/. 2013-02-08 17:49:21 -05:00
Thomas S Hatch
d4698d4df8 Fix #3654 2013-02-08 13:24:59 -07:00
Thomas S Hatch
68b5d29ea6 Get tests runnign until pydsl migration is complete 2013-02-08 13:21:35 -07:00
Thomas S Hatch
f138dd7b0f Revert "Move pydsl execiution module into salt/utils and update renderer" 
This reverts commit 71d952eb40.
 2013-02-08 13:17:52 -07:00
Thomas S Hatch
3719982399 stub out another event test that needs refinement 2013-02-08 13:14:45 -07:00
Thomas S Hatch
71d952eb40 Move pydsl execiution module into salt/utils and update renderer 2013-02-08 13:05:16 -07:00
Thomas S Hatch
f2d100eedb Add docsting to module in supervisord 2013-02-08 12:55:32 -07:00
Thomas S Hatch
c86a4176dc Don't expose sanitize_host 2013-02-08 12:54:15 -07:00
Thomas S Hatch
aa41d9a575 Add cli example to alternatives.show_current 2013-02-08 12:50:00 -07:00
Thomas S Hatch
42f2939c81 Add cli examples to rvm module 2013-02-08 12:47:02 -07:00
Thomas S Hatch
845ffb0258 Merge pull request #3652 from gthb/fix-virtualenv.managed-index-args 
Fix bug in propagating [extra_]index_url args
 2013-02-08 11:20:11 -08:00
Gunnlaugur Þór Briem
4f24bc8d53 Fix bug in propagating [extra_]index_url args 
(said bug consisting of not propagating them.)
 2013-02-08 18:36:24 +00:00
Thomas S Hatch
cee4c9723c Merge pull request #3651 from basepi/develop 
Fixes #3632 Add additional documentation for yum pkgrepo.managed calls
 2013-02-08 10:21:34 -08:00
Colton Myers
8c7c497880 Add additional documentation for yum pkgrepo.managed calls 2013-02-08 11:17:34 -07:00
Thomas S Hatch
107b97e952 Add test to verify loader modules 2013-02-08 11:14:22 -07:00
Thomas S Hatch
3d006ddd1c Stub out unreliable event test until it can be stabalized 2013-02-08 11:07:40 -07:00
Thomas S Hatch
42024cab39 Clean out unused code 2013-02-08 10:57:20 -07:00
Thomas S Hatch
3d1cf71a77 Combine compound matcher tests 2013-02-08 10:57:20 -07:00
Thomas S Hatch
2edd526c71 Remove unused import 2013-02-08 10:57:20 -07:00
Thomas S Hatch
04fa6918e8 Merge pull request #3650 from UtahDave/svn_test 
Fixes #3633  Add  test=True to svn.latest, Add svn.diff
 2013-02-08 09:38:56 -08:00
David Boucha
1d2f483d61 Check for non-existing target 2013-02-08 10:35:00 -07:00
David Boucha
3b34139bc7 Remove debugging print statements 2013-02-08 10:27:29 -07:00
David Boucha
b12bc07d39 Add test=True functionality 2013-02-08 10:24:23 -07:00
David Boucha
53aab2b32e add svn.diff function 2013-02-08 10:24:08 -07:00