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
36,078 Commits 24 Branches 182 Tags 341 MiB
e550590ac5
Commit Graph

2822 Commits

Author SHA1 Message Date
Colton Myers
c12f05f83a Merge branch '2014.7' into develop 
Conflicts:
	salt/modules/aptpkg.py
	salt/modules/tls.py
	salt/states/boto_asg.py
	salt/states/boto_secgroup.py
 2014-08-29 16:27:00 -06:00
Colton Myers
704180fd43 Merge branch '2014.7' into develop 
Conflicts:
	salt/utils/cloud.py
 2014-08-28 12:18:07 -06:00
rallytime
72de420e2d Tell jenkins to run integration tests for salt/runner.py 2014-08-28 10:53:22 -06:00
Thomas S Hatch
55422ccc42 Merge pull request #15303 from whiteinge/fix-wheelclient-auth-tests 
Fix failing integration tests for the wheel client
 2014-08-27 15:50:25 -06:00
Erik Johnson
ff6a228746 Remove reference to nonexistant function in pkg tests 
This fixes a ref that was missed in 7984a8c.
 2014-08-27 13:52:36 -05:00
rallytime
e1dde7c574 Enable wheel integration tests in runtests.py 2014-08-27 09:34:44 -06:00
Seth House
a96d58cfba Fix failing integration tests for the wheel client 2014-08-26 19:20:25 -06:00
Thomas S Hatch
d49f46786e Merge pull request #15250 from saltstack/bp-14975 
Backport #14975 to 2014.7
 2014-08-26 10:11:07 -06:00
Thomas S Hatch
871bfb42e2 lint in test script 2014-08-25 15:32:06 -06:00
Thomas S Hatch
e3624fa19a Merge branch 'add_fs_cache' of https://github.com/felskrone/salt into felskrone-add_fs_cache 2014-08-25 15:19:40 -06:00
Jon Henry
5b47b0bdb7 Fix gem unit test with new proxy parameter 2014-08-25 13:55:59 -06:00
Kamal Nasser
c613c08869 Replace all occurrences of "Digital Ocean" with "DigitalOcean" 2014-08-25 13:42:01 -06:00
vs
45e997d020 use default path for socket instead of /tmp/... 2014-08-25 15:16:12 +02:00
vs
f50ef837fd initial add for cache-testing skript 2014-08-25 14:17:00 +02:00
Gavin Swanson
d972aeff55 Merge branch 'addCygwin' into develop 2014-08-23 15:56:32 -07:00
Thomas S Hatch
f0009be6c2 Merge branch '2014.7' into develop 2014-08-21 17:20:26 -06:00
Erik Johnson
ec07a8efea Get effective username using pwd.getpwduid() 2014-08-21 15:22:54 -05:00
Erik Johnson
43de873bb2 D'oh, needed to capitalize USERNAME 2014-08-21 14:35:36 -05:00
Erik Johnson
26a3db2ac8 Set USERNAME env var manually in test suite 
This works around a known issue in GitPython when the USERNAME
environment variable is missing.
 2014-08-21 12:19:31 -05:00
Aditya Kulkarni
2d98bc16aa Warn if eventlisten is unable to access socket 2014-08-21 12:53:45 -04:00
Erik Johnson
bf982d6893 Update gitfs test opts to reflect new gitfs config opts 2014-08-20 22:23:45 -05:00
Pedro Algarvio
ac7174f9f6 Merge pull request #15113 from rallytime/remove_OrderedDict 
Use salt.utils.odict instead of python2.7 OrderedDict
 2014-08-21 00:13:25 +01:00
Colton Myers
916141fac0 Merge branch '2014.7' into develop 
Conflicts:
	tests/integration/shell/call.py
 2014-08-20 14:39:31 -06:00
C. R. Oldham
5caf4e35c9 Merge pull request #15098 from s0undt3ch/issues/14979-output-file-permissions 
Trim the output file as opposed to delete to keep same permissions.
 2014-08-20 11:16:42 -06:00
rallytime
e7a09640fa put -C tar command back in 2014-08-20 10:07:12 -06:00
rallytime
286de2466d Remove compound matching from jenkins.py 2014-08-20 09:49:49 -06:00
rallytime
2285a10a95 Use salt.utils.odict instead of python2.7 OrderedDict 2014-08-20 09:24:52 -06:00
Pedro Algarvio
bf406bf459 Add test case for --output-file-append 2014-08-20 02:42:29 +01:00
Pedro Algarvio
b6e259c21e Add test case for output file permissions 
Refs #14979
 2014-08-20 02:28:13 +01:00
Mike Place
8e3b01f17e Merge pull request #15013 from felskrone/add_tcp_dumper_script 
Add tcp dumper script
 2014-08-19 13:26:42 -06:00
Nicole Thomas
37420dfed3 Merge pull request #15012 from lyft/boto_vpc-boto_secgroup-resolve-unit-test-failures 
Boto vpc boto secgroup resolve unit test failures
 2014-08-19 13:05:14 -06:00
Colin Johnson
9e797d6664 skip if mock not found 2014-08-19 16:19:41 +00:00
Pedro Algarvio
8baf773b78 Merge branch 'develop' of github.com:saltstack/salt into develop 2014-08-18 05:37:27 +01:00
Pedro Algarvio
ea41586ba4 Merge branch '2014.7' into develop 2014-08-18 05:37:12 +01:00
vs
d1599b4780 more linting 2014-08-16 09:24:46 +02:00
vs
bae8d39bb1 lint fixes 2014-08-16 09:01:16 +02:00
Thomas S Hatch
02da0dda32 Merge pull request #15016 from whiteinge/netapi-fix-logout 
Add tests and a fix for the rest_cherrypy logout view
 2014-08-15 23:20:35 -06:00
Thomas S Hatch
fff64b37ab Merge pull request #14975 from jhenry82/issue_14304 
Issue 14304: add proxy parameter to gem.installed state
 2014-08-15 23:12:08 -06:00
Gavin Swanson
4eaa601f3c Added update and uninstall functions 
Should be able to remove and update things now. Also doesn't always
update when installing anymore. Update now only called via
salt['cyg.update']()
 2014-08-15 20:17:40 -07:00
Colin Johnson
72b9ebe304 move to LooseVersion for Boto version testing 2014-08-15 23:05:05 +00:00
Colin Johnson
c3a6f3d727 fix boto versions for boto_secgroup and boto_vpc 2014-08-15 22:57:44 +00:00
Colton Myers
932aa97e1f Merge branch '2014.7' into develop 2014-08-15 16:33:02 -06:00
Gavin Swanson
c8d19409f6 Add cygwin package installation 
Currently only hadles adding packages. Does not remove packages. It is
setup to update packages any time it is run, but there is no independent
update functionality.
Curently no unit/integration testing is done. I haven't wrapped my head
around the way the mocking and stuff is done yet.
 2014-08-15 14:13:22 -07:00
rallytime
b8db5ff56b Change lxc skipIf message to be more helpful 2014-08-15 14:21:09 -06:00
Colin Johnson
86bcea16ee resolve issue with boto < 2.4.0 GroupOrCIDR attributes 2014-08-15 18:58:26 +00:00
rallytime
396a4de7c5 Make lxc tests run! 2014-08-15 11:09:20 -06:00
Seth House
2b5bed43b9 Add integration test for logging out of the rest_cherrypy app 2014-08-15 09:45:30 -04:00
vs
12bc275388 fix mail address 2014-08-15 13:17:19 +02:00
vs
c26e50e694 more linting 2014-08-15 13:05:42 +02:00
vs
b175b705ce pylinting and cleanup 2014-08-15 13:03:26 +02:00