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,161 Commits 24 Branches 182 Tags 341 MiB
5f6af88afb
Commit Graph

44161 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rallytime
5f6af88afb Merge branch '2015.2' into 'develop' 2015-01-07 07:54:10 -07:00
Pedro Algarvio
06fdee00c8 Merge pull request #19426 from rallytime/merge_forward_fifteen 
Merge forward 2014.7 into 2015.2
 2015-01-07 09:27:40 +00:00
Mike Place
08486d5ede Merge pull request #19436 from cachedout/zypper_fix_backport 
Fix import in zypper
 2015-01-06 22:50:57 -07:00
Mike Place
e552b708e8 Fix import in zypper 2015-01-06 22:50:30 -07:00
Mike Place
4880fe0ab0 Merge pull request #19435 from cachedout/genent_backport 
Allow for variations in distros in group test
 2015-01-06 22:48:35 -07:00
Mike Place
2474cdfde0 Allow for variations in distros in group test 2015-01-06 22:46:28 -07:00
Mike Place
1700450dd8 Merge pull request #19432 from cachedout/fix_group_test 
Allow for variations in distros in group test
 2015-01-06 22:05:53 -07:00
Mike Place
309f91a979 Allow for variations in distros in group test 2015-01-06 22:04:19 -07:00
Mike Place
8b8555b165 Merge pull request #19431 from cachedout/urlparse_fix 
Fix import in zypper
 2015-01-06 21:47:46 -07:00
Mike Place
e53103e31d Fix import in zypper 2015-01-06 21:47:06 -07:00
Mike Place
f06b5ae344 Merge pull request #19427 from cachedout/kmod_skip 
Skip kmod test if /etc/modules isn't present
 2015-01-06 20:37:39 -07:00
Mike Place
22ccbf0542 Skip kmod test if /etc/modules isn't present 2015-01-06 20:36:45 -07:00
rallytime
80b07f3578 Merge branch '2014.7' into '2015.2' 
Conflicts:
	tests/buildpackage.py
 2015-01-06 20:32:36 -07:00
Nicole Thomas
dbbab28cdc Merge pull request #19425 from s0undt3ch/2014.7 
Ignore the file perms lint check
 2015-01-06 18:22:01 -07:00
Nicole Thomas
5abf095fc7 Merge pull request #19418 from rallytime/fix_more_develop_tests 
Fix blockdev module unit tests
 2015-01-06 18:19:43 -07:00
rallytime
cb5375043c Change file perms back to executable 2015-01-07 01:16:34 +00:00
Pedro Algarvio
a9eaf187e1 Ignore the file perms lint check 2015-01-07 01:15:56 +00:00
rallytime
c50402709b Change file perms on runtests.py 2015-01-07 01:15:02 +00:00
Mike Place
12f5d2f765 Merge pull request #19424 from saltstack/revert-19423-fix_blockdev_test 
Revert "Fix failing blockdev test"
 2015-01-06 18:03:03 -07:00
Mike Place
98e07c0642 Revert "Fix failing blockdev test" 2015-01-06 18:02:55 -07:00
Mike Place
89695d4ce9 Merge pull request #19423 from cachedout/fix_blockdev_test 
Fix failing blockdev test
 2015-01-06 18:01:28 -07:00
Mike Place
72c5e019af Fix failing blockdev test 2015-01-06 18:00:51 -07:00
rallytime
69d484d65d pylint fix 2015-01-07 00:57:50 +00:00
Nicole Thomas
e786060e2b Merge pull request #19421 from rallytime/pylint 
Fix my pylint errors
 2015-01-06 17:29:24 -07:00
rallytime
194c0696aa Fix my pylint errors 2015-01-06 17:27:38 -07:00
rallytime
f40affd5d9 Fix blockdev module unit tests 2015-01-06 23:00:12 +00:00
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
Mike Place
378639f141 Merge pull request #19416 from cachedout/jenkins_debug_version 
Add debugging to jenkins script
 2015-01-06 15:30:20 -07:00
Mike Place
75c067432f Add debugging to jenkins script 2015-01-06 15:29:21 -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
Thomas S Hatch
e923ff11e8 Merge pull request #19404 from eliasp/2014.7-states.service-dont-report-changes 
Don't report changes when there aren't any
 2015-01-06 14:05:36 -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
Elias Probst
4b1413fc8a Don't report changes when there aren't any 2015-01-06 21:22:08 +01: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