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
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
vs
11f544b3ba
fix missing brace
2014-08-15 12:15:49 +02:00
vs
0ad1f016ed
add tcp-dumper for visualzing salt-master network activity
2014-08-15 12:11:50 +02:00
Thomas S Hatch
2305a89aae
Merge pull request #14986 from steverweber/slspath_fix
...
include trailing slash for slspath template var
2014-08-14 23:55:55 -06:00
rallytime
e8fab3d28a
Fix psutil version
2014-08-14 21:22:55 -06:00
rallytime
0683c704dd
Move psutil version check
2014-08-14 21:20:25 -06:00
Colin Johnson
41c51b4044
resolve issue with Ubuntu 12.0.4 failures
2014-08-15 01:12:43 +00:00
rallytime
8dca2515ee
Skip virtual_memory and swap_memory tests if psutil < 0.6.0
2014-08-14 16:16:38 -06:00
Pedro Algarvio
9134a69dc1
Merge pull request #14990 from rallytime/gitpillar_tests
...
Fix gitpillar skipIfs
2014-08-14 18:44:29 +01:00
rallytime
7f170c126f
Remove 'RC1' from GIT_VERSION comparison
2014-08-14 11:06:18 -06:00
steve
091c40df21
save
2014-08-14 12:40:27 -04:00
rallytime
fe5b8d22ec
Fix gitpillar skipIfs
2014-08-14 10:34:38 -06:00
