Arnold Bechtoldt
3e483523ff
changing param back to backend in fileserver to improve useability
2014-09-22 11:16:27 -06:00
Arnold Bechtoldt
94516433e7
fix integration test in fileserver runner, refs #16008
2014-09-22 11:16:27 -06:00
Arnold Bechtoldt
cdfe301de0
change fileserver runner default output module to nested
2014-09-22 11:16:27 -06:00
Arnold Bechtoldt
aff73620bd
PEP8 E302 fixes in fileserver runner
2014-09-22 11:16:27 -06:00
Arnold Bechtoldt
b588245c1d
extend fileserver runner with additional features
2014-09-22 11:16:26 -06:00
Thomas S Hatch
3315b2bb6c
Merge pull request #16002 from terminalmage/issue15913
...
Fix traceback when ID declaration is numeric
2014-09-22 10:57:58 -06:00
Thomas S Hatch
f6bff1c7f8
Merge pull request #15972 from rallytime/bp-15775
...
Backport #15775 to 2014.7
2014-09-22 10:46:09 -06:00
Thomas S Hatch
7355f53057
Add fileserver_backend to jinja tests local opts
2014-09-22 10:29:25 -06:00
Thomas S Hatch
74c5f0fe97
bah, no tuple
2014-09-22 10:27:06 -06:00
Thomas S Hatch
f5a123f660
add the DumbAuth interface to stub out the gen_token call
2014-09-22 10:26:36 -06:00
Thomas S Hatch
29580ded32
lint fixes
2014-09-22 10:23:29 -06:00
Thomas Jackson
ee0cedb750
Fix the publish command in syndics
2014-09-22 09:59:18 -06:00
Erik Johnson
be90bb3b4b
Add missing comma
2014-09-22 09:15:58 -05:00
Erik Johnson
fdd0b13ea1
Set changes in return dict
...
This resolves a case in which an installed package is rebuilt but the
version does not change. Since the package db doesn't appear to have
changed, the ports.install function returns an empty dict, leading the
ports.installed state to believe there are no changes, thus setting the
color of the highstate output to green instead of cyan.
This changes the behavior of the ports.install function so that it sets
the return dict when the make install command succeeds, in cases where
no changes to the pkgdb are detected.
Fixes #9962 .
2014-09-21 20:18:22 -05:00
Pedro Algarvio
b1373b5d77
Merge pull request #16004 from terminalmage/lint
...
Fix missing import
2014-09-21 08:37:06 +01:00
Erik Johnson
1d3e42082e
Fix missing import
2014-09-20 22:46:20 -05:00
Erik Johnson
f280ed5dc5
Fix traceback when ID declaration is numeric
...
Fixes #15913
2014-09-20 21:45:08 -05:00
Thomas S Hatch
2eafd4e7ac
lint fixes
2014-09-20 13:14:35 -06:00
Thomas S Hatch
2268e2da33
clean up old tempfiles
2014-09-20 13:06:51 -06:00
Thomas S Hatch
3429eabd4a
The new FSClient does not have the same restraint as the local client
2014-09-20 13:01:52 -06:00
Thomas S Hatch
0cbc302333
still use reomte obj when pillar is remote
2014-09-20 12:22:03 -06:00
Thomas S Hatch
cfd657c1a6
Split the file clients, still use local for pillar
2014-09-20 12:20:16 -06:00
Thomas S Hatch
3fe53840c0
Merge pull request #15992 from rallytime/bp-15617
...
Backport #15617 to 2014.7
2014-09-19 21:41:29 -06:00
Thomas S Hatch
7ecc433d6d
Merge pull request #15991 from rallytime/bp-15600
...
Backport #15600 to 2014.7
2014-09-19 21:41:23 -06:00
Thomas S Hatch
baf24e7869
Merge pull request #15990 from rallytime/bp-15739
...
Backport #15739 to 2014.7
2014-09-19 21:40:22 -06:00
Thomas S Hatch
62b8d7a8fe
Merge pull request #15989 from rallytime/bp-15598
...
Backport #15598 to 2014.7
2014-09-19 21:39:02 -06:00
Thomas S Hatch
5a2fc3775a
Merge pull request #15988 from rallytime/bp-15919
...
Backport #15919 to 2014.7
2014-09-19 21:38:46 -06:00
Thomas S Hatch
3a01c4e988
Merge pull request #15987 from rallytime/bp-15916
...
Backport #15916 to 2014.7
2014-09-19 21:38:16 -06:00
Thomas S Hatch
9355985e70
Merge pull request #15985 from rallytime/bp-15915
...
Backport #15915 to 2014.7
2014-09-19 21:37:53 -06:00
Thomas S Hatch
e14ce4c136
Merge pull request #15975 from rallytime/bp-15877
...
Backport #15877 to 2014.7
2014-09-19 21:35:42 -06:00
Thomas S Hatch
8e2f613461
Merge pull request #15974 from rallytime/bp-15826
...
Backport #15826 to 2014.7
2014-09-19 21:35:39 -06:00
Thomas S Hatch
edf7885b2e
Merge pull request #15971 from rallytime/bp-15768
...
Backport #15768 to 2014.7
2014-09-19 21:34:15 -06:00
Thomas S Hatch
1b03014424
Remove old ssh functions
2014-09-19 19:50:44 -06:00
Thomas S Hatch
5a57b69a55
Add master_opts to the fileserver object allowing clean pass-through
2014-09-19 19:41:52 -06:00
Erik Johnson
ee51c361b4
Merge pull request #15993 from terminalmage/bp-15986
...
Backport #15986 to 2014.7
2014-09-19 18:20:34 -05:00
Warren Turkal
95c45a7907
Fix a small typo.
...
Signed-off-by: Warren Turkal <wt@signalfuse.com>
2014-09-19 18:19:33 -05:00
rallytime
936a6bca5a
Fix mdadm tests
2014-09-19 16:35:43 -06:00
Joseph Hall
5b4fa97623
Let's do assemble while we're at it
2014-09-19 16:31:43 -06:00
Joseph Hall
18908744e4
Need to properly add lists to each other
2014-09-19 16:30:52 -06:00
Joseph Hall
fe9a9cc242
Switch mdadm.create to not shell out
2014-09-19 16:30:52 -06:00
Nitin Madhok
ac27fb7ff0
Fixing pylint violations
2014-09-19 16:20:08 -06:00
Nitin Madhok
61169fde06
Removing extra quote
2014-09-19 16:12:47 -06:00
Nitin Madhok
a238660ca1
Missed spaces for indentation
2014-09-19 16:12:46 -06:00
Nitin Madhok
1f764be249
Added test functionality in all state functions within salt.states.keystone
2014-09-19 16:12:46 -06:00
Matthew X. Economou
b37618b788
Fixed 'virtual: VirtualPC' setting on FreeBSD in salt/grains/core.py
2014-09-19 16:06:30 -06:00
Jernej Kos
8e253026f7
Added support for capabilities in docker state.
2014-09-19 15:47:13 -06:00
Jille Timmermans
8ee930014a
Fix file.directory in test mode to show all the changes (user, group and/or mode) instead of just one
2014-09-19 15:44:57 -06:00
Jille Timmermans
065ccb7b0c
Improved fix for the newline at the end of crontabs
...
Fixes issue #15699 and improves PR #15771
2014-09-19 15:40:16 -06:00
Thomas S Hatch
4bf6da241d
change salt-ssh to use the new fsclient to get files
2014-09-19 13:25:43 -06:00
Thomas S Hatch
a256057a83
It is a little slower, but there are serious overlooked
...
problems with the localClient interface, so I am going to replace
the default LocalClient with FSClient to make the full data
stream consistent for now
2014-09-19 13:20:53 -06:00