Pedro Algarvio
2174e8cb49
Fix no spaces before operator.
2013-08-22 09:34:49 +01:00
David Boucha
7d353d91ca
Merge pull request #6844 from terminalmage/docs
...
Add more information on overriding providers
2013-08-21 17:05:50 -07:00
Erik Johnson
92859fef05
Merge pull request #6845 from UtahDave/fix_windows_blowups
...
Fix windows blowups from imports of unavailable modules
2013-08-21 16:59:34 -07:00
David Boucha
c7bea5dc61
Change to HAS_ALL_IMPORTS for clarity
2013-08-21 17:57:42 -06:00
David Boucha
29bf69b102
Add csv to items that are blowing up Windows. :)
2013-08-21 17:37:55 -06:00
David Boucha
509994feaa
Add virtual function to not blow up Windows
2013-08-21 17:31:56 -06:00
David Boucha
bdd8434fdc
Add virtual function so it doesn't blow up windows
2013-08-21 17:28:07 -06:00
David Boucha
98927b6a66
move dom import to try/except.
...
Windows barfs on from xml.dom import minidom
2013-08-21 17:18:34 -06:00
Erik Johnson
83de87ac23
Fix sphinx build warning
2013-08-21 16:52:46 -06:00
Erik Johnson
f15ce62cea
Add more information on overriding providers
...
As noted in IRC, if you are using a custom linux spin or derivative, it
may not be apparent which provider to use when overriding providers in
the minion config file. This commit adds a massive table for the pkg,
service, user, and group providers which explains how they are used, to
help guide the user to the correct decision when specifying a provider
override.
2013-08-21 16:49:25 -06:00
Pedro Algarvio
0860da1852
Add debug print to check if communicate is doin' the right thing.
2013-08-21 23:41:27 +01:00
Colton Myers
045a47ef9c
Merge pull request #6842 from UtahDave/fix_windows_user.present
...
Fix windows user.present so groups are set correctly the first run
2013-08-21 15:37:56 -07:00
Pedro Algarvio
7db576d0a0
Flush spooled temporary files before reading back the data contained.
2013-08-21 23:33:44 +01:00
David Boucha
00c17d54b0
Set groups and full name properly first run
2013-08-21 16:30:15 -06:00
David Boucha
8c4b147378
improve group mgmnt in user.present on Windows
2013-08-21 16:12:24 -06:00
Thomas S Hatch
ea9e612c75
Merge pull request #6836 from basepi/contains6817
...
Make sure text is a string for file.contains, Fix #6817
2013-08-21 15:06:17 -07:00
Thomas S Hatch
cf458822f0
Merge pull request #6840 from s0undt3ch/hotfix/fix-gitfs-root
...
Keep old behaviour if `gitfs_root` is not set or is set to an empty string
2013-08-21 15:05:35 -07:00
David Boucha
6e5967d4a2
strip both spaces and * from Group names
2013-08-21 16:03:14 -06:00
Pedro Algarvio
3840e3ca3e
Keep old behaviour if gitfs_root
is not set or is set to an empty string.
2013-08-21 23:03:12 +01:00
Thomas S Hatch
f739334243
Merge pull request #6834 from jacksontj/develop
...
Move fileclient local hashing to use utils
2013-08-21 14:58:53 -07:00
Pedro Algarvio
f6e17f7b66
Merge pull request #6841 from s0undt3ch/develop
...
Fix bug introduced in fcfe3a9
when changing argspec to use the named tuple
2013-08-21 14:50:28 -07:00
Pedro Algarvio
c323143ba0
Fix bug introduced in fcfe3a9
when changing argspec to use the named tuple
2013-08-21 22:45:11 +01:00
David Boucha
36f9ddc2bb
On Windows remove spaces and * from group names
2013-08-21 15:34:57 -06:00
David Boucha
3c6cec6dfd
Add any groups that are passed in as options
2013-08-21 15:09:57 -06:00
Joseph Hall
7647993c9e
Merge pull request #6837 from s0undt3ch/develop
...
Don't fail if there's nothing to feed to `max()`.
2013-08-21 13:49:44 -07:00
Pedro Algarvio
7af5e4af7b
Don't fail if there's nothing to feed to max()
.
2013-08-21 21:48:25 +01:00
Pedro Algarvio
fe62282d67
Merge pull request #6835 from cvrebert/patch-2
...
deprecations.rst: fix grammar: it's => its
2013-08-21 13:45:57 -07:00
Colton Myers
4204868cfb
Make sure text is a string for file.contains, Fix #6817
2013-08-21 14:45:27 -06:00
Colton Myers
9a932ab8db
Fix some formatting (pep8)
2013-08-21 14:45:19 -06:00
Chris Rebert
193bd841ac
deprecations.rst: fix grammar: it's => its
2013-08-21 13:42:39 -07:00
Thomas Jackson
636b3f047a
Adding missing func call
2013-08-21 13:20:44 -07:00
Thomas Jackson
6d8a0376f9
Move to using utils hash function
2013-08-21 12:57:39 -07:00
Thomas Jackson
8b156f3025
Iterate over file to generate md5 sum
2013-08-21 12:38:59 -07:00
Colton Myers
d7e3be495a
Merge pull request #6832 from s0undt3ch/features/named-tuples-argspec
...
Since salt required python >= 2.6 we can use the `getargspec` named tuple
2013-08-21 12:21:35 -07:00
Pedro Algarvio
fcfe3a99f4
Since salt required python >= 2.6 we can use the getargspec
named tuple.
2013-08-21 19:26:57 +01:00
Pedro Algarvio
1fd7fafdde
Merge pull request #6831 from s0undt3ch/develop
...
Fix 'runtests.py', use named tuples from getargspec
2013-08-21 11:25:53 -07:00
Pedro Algarvio
b175567d1b
Also pass password
on salt.modules.svn.diff()
2013-08-21 19:23:16 +01:00
Pedro Algarvio
8100b41c7e
Fixed splitting named unittests from named integration tests.
...
This commit got lost somewhere. I could swear I committed this fix previously...
2013-08-21 19:23:16 +01:00
Pedro Algarvio
1109866bff
Merge pull request #6828 from UtahDave/fix_windows_user.present
...
Don't compare password hashes on Window
2013-08-21 10:52:55 -07:00
Pedro Algarvio
e59e26ab4d
Merge pull request #6827 from ruebenramirez/develop
...
adding password to state svn.py
2013-08-21 10:10:17 -07:00
David Boucha
6820e78883
Don't compare password hashes on Window
...
Windows doesn't have a way to return the password hash so we can't
compare the hashes
2013-08-21 10:08:19 -06:00
Rueben Ramirez
42e8c70f2c
adding password to state svn.py
2013-08-21 16:01:07 +00:00
David Boucha
bfce7dead9
Merge pull request #6816 from ruebenramirez/develop
...
correcting a missing comma typo
2013-08-20 23:42:01 -07:00
Rueben Ramirez
fc78c92772
correcting a missing comma typo
2013-08-21 06:36:01 +00:00
Thomas S Hatch
6021382b65
Merge pull request #6814 from ruebenramirez/develop
...
added password parameter to support authenticated SVN commands
2013-08-20 18:37:28 -07:00
Rueben Ramirez
bbfbd0f4e1
added password parameter to support authenticated SVN commands
2013-08-21 00:16:46 +00:00
Pedro Algarvio
0f837d2702
Merge pull request #6811 from s0undt3ch/hotfix/absolute-imports
...
Because of the recent salt sys module rename, force absolute imports.
2013-08-20 16:11:41 -07:00
Pedro Algarvio
1956a6e5cc
Sort modules and states.
2013-08-21 00:10:26 +01:00
Pedro Algarvio
b6e7c6836e
h3
was too big but it can be the same size of p
nor h2
.
2013-08-21 00:05:48 +01:00
Pedro Algarvio
949c882278
Add documentation to style guide as to why absolute imports should be avoided.
2013-08-21 00:04:21 +01:00