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
43,973 Commits 24 Branches 182 Tags 341 MiB
a7a5362798
Commit Graph

43973 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas S Hatch
a7a5362798 Merge pull request #19370 from Seveland12/develop 
fixed typo in tests/consist.py
 2015-01-06 10:22:55 -07:00
Thomas S Hatch
4ce4a63c00 Merge pull request #19366 from cachedout/issue_18598 
Fix typo in jboss7 module.
 2015-01-06 10:21:45 -07:00
Thomas S Hatch
13c0885277 Merge pull request #19344 from RobertFach/svn-export-fix-issue-19343 
Svn export fix issue 19343
 2015-01-06 10:15:27 -07:00
Thomas S Hatch
40aec9da44 Merge pull request #19390 from thatch45/jayeshka-apache_unit_test 
Merge #19342
 2015-01-06 10:14:49 -07:00
Thomas S Hatch
b01ac59df6 fix bad lint error 2015-01-06 10:13:47 -07:00
Thomas S Hatch
ab0b432d94 Merge branch 'apache_unit_test' of https://github.com/jayeshka/salt into jayeshka-apache_unit_test 2015-01-06 10:11:50 -07:00
robert.fach
d6389c8e1c fixed identation problem 2015-01-06 09:42:17 +01:00
Joseph Hall
adbcb96c09 Merge pull request #19315 from Melrok/fix-salt-cloud-volumes 
Fix salt cloud volumes
 2015-01-05 21:02:18 -07:00
sjwehry
8eb6de4e09 fixed typo in tests/consist.py 
fixed typo in tests/consist.py
 2015-01-05 20:01:16 -05:00
root
9993366d70 Changed from using type() to isinstance() per pull request comment 2015-01-06 00:11:26 +00:00
Mike Place
ef567a9309 Fix typo in jboss7 module. 
Closes #18598
 2015-01-05 15:57:09 -07:00
Pedro Algarvio
927290ff44 Merge pull request #19359 from rallytime/pylint_fix 
Pylint fix for develop
 2015-01-05 22:20:13 +00:00
rallytime
6d26bd4c0c Pylint fix for develop 2015-01-05 14:42:03 -07:00
Thomas S Hatch
5fcb74226b Merge pull request #19351 from jfindlay/win_firewall 
win_firewall: fix disable, enable and add delete_rule
 2015-01-05 13:28:44 -07:00
Thomas S Hatch
9cc1af7ebc Merge pull request #19347 from mens/patch-1 
Update states/augeas.py. Fix index error.
 2015-01-05 13:27:45 -07:00
Thomas S Hatch
23935b9d04 Merge pull request #19346 from garethgreenaway/19291_pkg_state_version_latest 
Additions to pkg state module
 2015-01-05 13:27:26 -07:00
Thomas S Hatch
3de7cfc415 Merge pull request #19345 from cachedout/django_cleanup 
Catch all Django errors and some PEP8 cleanup.
 2015-01-05 13:27:04 -07:00
Thomas S Hatch
27c539279a Merge pull request #19339 from rynemccall/support-non-ascii-output 
Support messages containing non-ascii characters
 2015-01-05 13:26:40 -07:00
Thomas S Hatch
6f13509cc0 Merge pull request #19341 from Lacrymology/safe-pillar-get 
fix docstring for pillar.get
 2015-01-05 13:24:43 -07:00
Thomas S Hatch
8bfa8f8259 Merge pull request #19328 from jmdcal/load_checking 
load checking
 2015-01-05 13:22:41 -07:00
Thomas S Hatch
3a1cffde9e Merge pull request #19322 from garethgreenaway/19132_simple_state_notification 
Adding a simple notification function to the test module.
 2015-01-05 13:17:24 -07:00
Thomas S Hatch
dd4fd3ace5 Merge pull request #19307 from blueicefield/feature_mongodb-roles 
Feature : Adding functions to Mongodb module for the management of user roles
 2015-01-05 13:13:29 -07:00
Justin Findlay
18d52d1ff8 fixup win_firewall {en|dis}able 2015-01-05 12:21:26 -07:00
Justin Findlay
ae83af0b71 adding firewall.delete_rule function 
also correcting the documentation for firewall.add_rule
 2015-01-05 12:13:10 -07:00
Nicole Thomas
f01ce36e89 Merge pull request #19340 from nmadhok/zpool-unit-test 
Adding unit tests for salt.modules.zpool
 2015-01-05 10:11:46 -07:00
Gareth J. Greenaway
fe39aade2a Allow the version argument for the pkg state to accept the "latest" as a value. If specified then the latest version available will be installed. Per #19291 2015-01-05 09:05:09 -08:00
Christophe Fonteyne
26151774fd Update states/augeas.py. Fix index error. 
When specifying the test parameter, you get the error:

    Function: augeas.change
      Result: False
     Comment: An exception occurred in this state: Traceback (most recent call last):
                File "/usr/lib/python2.6/site-packages/salt/state.py", line 1533, in call
                  **cdata['kwargs'])
                File "/usr/lib64/python2.6/contextlib.py", line 34, in __exit__
                  self.gen.throw(type, value, traceback)
                File "/usr/lib/python2.6/site-packages/salt/utils/context.py", line 41, in func_globals_inject
                  yield
                File "/usr/lib/python2.6/site-packages/salt/state.py", line 1533, in call
                  **cdata['kwargs'])
                File "/usr/lib/python2.6/site-packages/salt/states/augeas.py", line 170, in change
                  ret['comment'] += ' in file {1}:\n'.format(context)
              IndexError: tuple index out of range


This change fixes the issues and provides better output.
 2015-01-05 18:04:19 +01:00
Mike Place
cfc76d585e Catch all Django errors and some PEP8 cleanup. 
Django can throw a variety of errors, so we need to catch
Django-specific exceptions instead of just an ImportError.
 2015-01-05 09:41:53 -07:00
robert.fach
2b4caaa45f changed salt call to modules/svn.py svn.export function, added revision field to function call argument list 2015-01-05 16:54:14 +01:00
robert.fach
4cb4c7d6e0 changed salt call to modules/svn.py svn.export function, added revision field to function call argument list 2015-01-05 16:50:24 +01:00
Jayesh
e20076691b adding apache unit test case 2015-01-05 15:06:14 +05:30
Tomas Neme
1f8def056f fix docstring 2015-01-05 15:03:41 +08:00
Nitin Madhok
c21c7c96c5 Changing return to match zpool list instead of zfs list 2015-01-04 23:48:30 -05:00
nmadhok
2c53cbec1d Replacing zfs with zpool 2015-01-05 10:04:38 +05:30
Ryne McCall
a0e2f09ec5 Support messages containing non-ascii characters 
This fixes #19338.
 2015-01-04 21:58:07 -05:00
Pedro Algarvio
0452b43af6 Merge pull request #19335 from rallytime/pylint_develop 
Fix develop pylint
 2015-01-04 11:56:20 +00:00
rallytime
fb9bc7de94 Fix develop pylint 2015-01-03 22:02:41 -07:00
Nicole Thomas
621bcee92d Merge pull request #19273 from jayeshka/extfs_unit_tests 
adding extfs unit test
 2015-01-03 20:20:09 -07:00
James Michael DuPont
5d72c52838 load checking 
want to rebuild
fixes #19264

load checking

want to rebuild
 2015-01-03 16:22:36 -06:00
Gareth J. Greenaway
6a3c15a7c3 Adding a simple notification function to the test module. 2015-01-02 15:24:32 -08:00
Thomas S Hatch
e2dd4b9958 Merge pull request #19320 from clan/opt_profile 
add 'state_output_profile' option for profile output
 2015-01-02 10:39:22 -07:00
Z. Liu
d46b6b6490 sate_output_profile default to True 2015-01-03 01:36:21 +08:00
Z. Liu
3fce994d30 fix type: statei -> state 2015-01-03 01:26:12 +08:00
Z. Liu
8217f5fa66 add 'state_output_profile' option for profile output 2015-01-02 22:56:39 +08:00
Pedro Algarvio
c316c11168 Merge pull request #19314 from dawsonbotsford/develop 
Spelling correction automated from Dawson's Spelling Bee
 2014-12-31 23:39:07 +00:00
Shad Nygren
4b335b5e2c Fix TypeError: string indices must be integers, not str in ec2.py create_attach_volumes() 2014-12-31 23:14:04 +00:00
Shad Nygren
773d426adc Fix AttributeError: 'list' object has no attribute 'items' in cloud.py run_func_until_ret_arg() 2014-12-31 23:12:51 +00:00
dawsonbotsford
adcf77c484 Spelling correction automated from Dawson's Spelling Bee 2014-12-31 18:10:29 -05:00
Nassim KACHA
5705ed5389 Improved code readability 2014-12-31 14:24:59 +01:00
Nassim KACHA
d129b5dbf1 fix errors to pass lint test 2014-12-31 13:52:14 +01:00