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
44,001 Commits 24 Branches 182 Tags 341 MiB
d88cb37538
Commit Graph

44001 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas S Hatch
d88cb37538 Merge pull request #19408 from thedrow/patch-2 
Rbenv documentation fix
 2015-01-06 14:08:56 -07:00
Omer Katz
27a84c5e7e Removed a duplicate dependecy and added libffi which is needed according to https://github.com/sstephenson/ruby-build/wiki#build-failure-of-fiddle-with-ruby-220 2015-01-06 22:50:55 +02:00
Mike Place
520b709f8e Merge pull request #19407 from cachedout/more_arch 
Tweak arch db upgrade
 2015-01-06 13:47:21 -07:00
Mike Place
acca71a681 Tweak arch db upgrade 2015-01-06 13:46:45 -07:00
Mike Place
d2d1085f93 Merge pull request #19406 from cachedout/batch_fix 
Default transport in ckminions
 2015-01-06 13:40:27 -07:00
Mike Place
aa12ac9083 Default transport in ckminions 2015-01-06 13:39:57 -07:00
Mike Place
b5e948e396 Merge pull request #19403 from cachedout/backport_bootstrap 
Backport arch and centos fixes into deploy bootstrap
 2015-01-06 13:22:29 -07:00
Mike Place
b49e7b120d Backport arch and centos fixes into deploy bootstrap 2015-01-06 13:21:53 -07:00
Thomas S Hatch
48a5597847 Merge pull request #19323 from jacksontj/aes_cleanup 
Make AES key never hit disk on the master
 2015-01-06 11:53:56 -07:00
Mike Place
170ce2a6f3 Merge pull request #19396 from cachedout/remove_unused_import_in_cp 
These were unused and causing weird recursion errors in unit tests
 2015-01-06 11:04:25 -07:00
Mike Place
c706ed279c These were unused and causing weird recursion errors in unit tests 2015-01-06 11:03:21 -07:00
Thomas S Hatch
00e9686488 Merge pull request #19303 from cachedout/batch_ckminions 
Batch ckminions
 2015-01-06 10:37:42 -07:00
Thomas S Hatch
8915ee4260 Merge pull request #19388 from lorengordon/develop 
Update vcredist version, fixes saltstack/salt#19387
 2015-01-06 10:25:05 -07:00
Thomas S Hatch
1a04c83a3d Merge pull request #19385 from ajacoutot/develop 
openbsdrcctl: fix code to match new rcctl(8) syntax.
 2015-01-06 10:24:44 -07:00
Thomas S Hatch
04733d3535 Merge pull request #19372 from hulu/log-setup-naming 
rename log setup funcs for PEP8 compliance
 2015-01-06 10:23:43 -07:00
Thomas S Hatch
6218e98a18 Merge pull request #19371 from hulu/auth-django 
minor cleanup of Django auth
 2015-01-06 10:23:28 -07:00
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
Antoine Jacoutot
7b99eeb6ab openbsdrcctl: turn badvar into a tuple and fix lint warnings 2015-01-06 18:14:23 +01: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
Loren Gordon
a1d7868d64 Update vcredist version, fixes saltstack/salt#19387 
Install the most current version of vcredist, Microsoft Visual C++ 2008
Service Pack 1 Redistributable Package MFC Security Update.
 2015-01-06 12:02:36 -05:00
Antoine Jacoutot
113c56a8da openbsdrcctl: fix code to match new rcctl(8) syntax. 2015-01-06 16:23:11 +01: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
Chris Rebert
5304e272c2 rename log setup funcs for PEP8 compliance 2015-01-05 17:59:45 -08:00
Chris Rebert
12b4260709 minor cleanup of Django auth 2015-01-05 17:56:16 -08:00
Thomas Jackson
687012b6c5 Pop "aes" from the opts before passing to ext_pillar modules 
We should probably not put "aes" in the global opts dict, but rather as a class attribute of auth/crypticle or something
 2015-01-05 17:23:24 -08:00
Thomas Jackson
d226ebbf43 Pylint cleanup 2015-01-05 17:23:19 -08: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