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,131 Commits 24 Branches 182 Tags 341 MiB
869f64b9ca
Commit Graph

44131 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
869f64b9ca Merge pull request #19414 from rallytime/dev_test_fix 
Fix djangomod.py integration test failures
 2015-01-06 15:32:34 -07:00
rallytime
ed3a34624c Fix djangomod.py integration test failures 2015-01-06 22:26:46 +00:00
Nicole Thomas
b37464d8a1 Merge pull request #19409 from basepi/merge-forward-develop 
Merge forward from 2015.2 to develop
 2015-01-06 14:54:00 -07:00
Thomas S Hatch
e595b3b8f4 Merge pull request #19368 from rallytime/python_shell 
Changes and additions of python shell kwargs
 2015-01-06 14:17:27 -07:00
Colton Myers
c5cdc575d0 Merge branch '2015.2' into merge-forward-develop 
Conflicts:
	salt/utils/reactor.py
	tests/jenkins-ng.py
 2015-01-06 14:16:15 -07:00
Thomas S Hatch
d88cb37538 Merge pull request #19408 from thedrow/patch-2 
Rbenv documentation fix
 2015-01-06 14:08:56 -07:00
Thomas S Hatch
b4a0c2b37a Merge pull request #19402 from basepi/merge-forward-2015.2 
Merge forward from 2014.7 to 2015.2
 2015-01-06 14:06:19 -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
Colton Myers
56eae4783a Merge branch '2014.7' into merge-forward-2015.2 2015-01-06 13:33:18 -07:00
Nicole Thomas
83e451d392 Merge pull request #19401 from rallytime/test_fixes 
Pylint and psutil unit test fixes for 2014.7 branch
 2015-01-06 13:24:15 -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
Colton Myers
f6eae029f0 Merge branch '2014.7' into merge-forward-2015.2 
Conflicts:
	pkg/windows/installer/Salt-Minion-Setup.nsi
	salt/grains/core.py
	salt/minion.py
	salt/modules/mongodb.py
	salt/states/archive.py
	salt/states/mount.py
	salt/utils/master.py
	salt/utils/schedule.py
	salt/utils/thin.py
	tests/jenkins-ng.py
 2015-01-06 13:14:27 -07:00
rallytime
c105867720 namedtuple doesn't exist in psutil._compat in psutil 2.2.0 2015-01-06 12:08:31 -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
Nicole Thomas
ec84d57aee Merge pull request #19397 from rallytime/bp-19396 
Backport #19396 to 2014.7
 2015-01-06 11:23:53 -07:00
Mike Place
88f3477772 These were unused and causing weird recursion errors in unit tests 2015-01-06 11:22:32 -07:00
rallytime
73ef44dd9f Pylint fix for 2014.7 branch 2015-01-06 11:14:06 -07:00
Thomas S Hatch
5452436bb2 Merge pull request #19394 from s0undt3ch/2014.7 
Remove unused script
 2015-01-06 11:06:55 -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
Pedro Algarvio
f377a74fa2 Remove unused script 2015-01-06 17:54:23 +00: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
6d3461d688 Merge pull request #19391 from lorengordon/2014.7 
Update vcredist version, fixes saltstack/salt#19387
 2015-01-06 10:28:11 -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
4566591f55 Merge pull request #19369 from eliasp/2014.7-states.mount_invisible-options 
2014.7 states.mount invisible options
 2015-01-06 10:22:43 -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
f5349e96a6 Merge pull request #19358 from rallytime/bp-19347 
Backport #19347 to 2014.7
 2015-01-06 10:18:18 -07:00
Loren Gordon
7f7c7bd337 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:18:13 -05:00
Thomas S Hatch
aec0417e13 Merge pull request #19357 from rallytime/bp-19278 
Backport #19278 to 2014.7
 2015-01-06 10:18:08 -07:00
Thomas S Hatch
41bef7771e Merge pull request #19356 from rallytime/bp-19340 
Backport #19340 to 2014.7
 2015-01-06 10:17:49 -07:00
Thomas S Hatch
2775737859 Merge pull request #19355 from rallytime/bp-19247 
Backport #19247 to 2014.7
 2015-01-06 10:17:27 -07:00
Thomas S Hatch
c6b367095e Merge pull request #19354 from cachedout/avoid_open_mode_key_race 
Avoid a race between multiple auth requests for a minion key
 2015-01-06 10:17:09 -07:00
Thomas S Hatch
ce34da5bdc Merge pull request #19353 from rallytime/bp-18323 
Backport #18323 to 2014.7
 2015-01-06 10:16:37 -07:00
Thomas S Hatch
e31cd4208a Merge pull request #19352 from rallytime/bp-19280 
Backport #19280 to 2014.7
 2015-01-06 10:16:25 -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
Thomas S Hatch
4da0b59d7d Merge pull request #19378 from llinder/2014.7 
Fixed undefined data variable in s3 utils
 2015-01-06 10:01:05 -07:00