Erik Johnson
fca4c80e5b
Add unit test for #9097
2013-12-07 20:54:07 -06:00
Erik Johnson
7b33ded0a5
Fix file.replace bug when replacement str is numeric
2013-12-07 20:42:03 -06:00
Pedro Algarvio
c8efce9f80
Merge pull request #9100 from techhat/monitoring
...
Add monitoring state for load average
2013-12-07 09:30:31 -08:00
Joseph Hall
c4520ff4d7
Add monitoring state for load average
2013-12-07 05:28:29 -07:00
Joseph Hall
4449fbd1c7
Merge pull request #9098 from holmboe/presense-typo
...
Fix presense typo in event tag
2013-12-07 02:02:33 -08:00
Henrik Holmboe
8638fb1f60
Fix presense typo in event tag
2013-12-07 08:34:49 +01:00
Thomas S Hatch
f59f816ec8
Revert "Modify the sign_in function to first check to see if a TCP connection can be established to the master. If not, fail immediatley instead of waiting for the default timeout of 60 seconds. Refs #7001."
...
This reverts commit f41dfe0e41
2013-12-07 00:27:00 -07:00
Pedro Algarvio
6ab8c0885a
Merge pull request #9094 from cvrebert/patch-1
...
avoid shadowing set built-in type in modules.memcached
2013-12-06 15:57:23 -08:00
Chris Rebert
bb5e2b4a62
avoid shadowing set built-in type in modules.memcached
...
salt/modules/memcached.py:85: [W0622(redefined-builtin), set] Redefining built-in 'set'
2013-12-06 15:26:11 -08:00
Colton Myers
1be4c32c77
Merge pull request #9090 from terminalmage/issue9085
...
Fix user.present states with non-string fullname
2013-12-06 15:10:39 -08:00
Pedro Algarvio
1e8ac0b8a2
Merge pull request #9092 from terminalmage/travis
...
Quiet travis failures for new functions missing docstrings
2013-12-06 15:03:00 -08:00
Erik Johnson
95ddb00c76
Add reminder to update tests when functions are implemented
2013-12-06 16:36:57 -06:00
Erik Johnson
a7769b358e
Quiet travis failures for new functions missing docstrings
2013-12-06 16:27:56 -06:00
Erik Johnson
e618befaf8
Add test case for numeric GECOS data
2013-12-06 16:16:38 -06:00
Erik Johnson
c8e5381aae
Fix user.present states with non-string fullname
2013-12-06 15:48:40 -06:00
Erik Johnson
685d1d36de
Fix requisite tests
...
Now that state.func_name is invalid in requisites, remove them from this
test.
2013-12-06 15:16:57 -06:00
Erik Johnson
cab102b822
Make requisite_ins throw errors when '.' in state
...
This changes the behavior added in #8823 , causing requisite_ins to throw
errors instead of logging warnings when there is a '.' in the state that
is being required/watched/etc.
2013-12-06 15:16:57 -06:00
Erik Johnson
bd9302ccfe
Add check for '.' in require/watch requisites
...
This commit will cause require/watch requisites to fail if they contain
dots. The prior behavior just ignored the dot, but since the function
name is ignored, and dots are already illegal in prereq requisites, this
commit makes the behavior more consistent.
2013-12-06 15:16:57 -06:00
Thomas S Hatch
3970c1ba77
Merge pull request #9089 from makinacorpus/last-buildout-errors
...
small space error
2013-12-06 12:39:00 -08:00
Mathieu Le Marec - Pasquet
303f5a782c
small space error
2013-12-06 20:37:51 +00:00
Thomas S Hatch
8631715671
Merge pull request #9088 from makinacorpus/last-buildout-errors
...
fix last zcbuildout pylint errors
2013-12-06 12:35:18 -08:00
Mathieu Le Marec - Pasquet
50b6ba65f8
fix last zcbuildout pylint errors
2013-12-06 20:32:33 +00:00
Pedro Algarvio
fe76fb8df0
Higher timeout.
2013-12-06 19:16:41 +00:00
Pedro Algarvio
8ef0c93c3c
Merge pull request #9087 from s0undt3ch/develop
...
Some more fixes for buildout
2013-12-06 11:11:38 -08:00
Pedro Algarvio
8f8e3edd0f
Lower the url request timeout and log it.
2013-12-06 19:09:38 +00:00
Thomas S Hatch
dcc1a065d7
Add presence events
2013-12-06 11:41:40 -07:00
Pedro Algarvio
bff4c99149
Attribute name changed.
2013-12-06 18:13:22 +00:00
Thomas S Hatch
237da3645a
Merge pull request #9084 from s0undt3ch/develop
...
Some more Lint and formatting fixes
2013-12-06 10:04:38 -08:00
Pedro Algarvio
22cf1df232
Some more Lint and formatting fixes
2013-12-06 18:00:26 +00:00
Thomas S Hatch
0dc996d573
whitespace
2013-12-06 10:50:58 -07:00
Thomas S Hatch
41df5b16f3
pylint
2013-12-06 10:50:24 -07:00
Thomas S Hatch
a6eb0cb460
Fix code errors in disk integration test
2013-12-06 10:49:19 -07:00
Thomas S Hatch
d5efc2c8af
a few more pylints that came up only after others were fixed
2013-12-06 10:40:16 -07:00
Thomas S Hatch
cc008b4b3b
some pylint I missed
2013-12-06 10:33:59 -07:00
Thomas S Hatch
e9cef9b6e5
pylint
2013-12-06 10:25:10 -07:00
Thomas S Hatch
902ef22f24
remove unreachable code
2013-12-06 10:23:48 -07:00
Thomas S Hatch
430b2659c3
pylint
2013-12-06 10:22:46 -07:00
Thomas S Hatch
e7fcb374e8
pylint fixes for debian_ip
...
@garethgreenaway you did MUCH better on the pylint this round,
these fixes are very minor and almost all represent some updates
to the code that get missed a lot, thanks!
2013-12-06 10:20:03 -07:00
Thomas S Hatch
3290d4f000
Fix #9083
2013-12-06 09:50:46 -07:00
Thomas S Hatch
0503f138bc
Merge pull request #9082 from Psycojoker/develop
...
more detailed output when a command fails
2013-12-06 08:54:51 -08:00
Thomas S Hatch
ba3e364931
Fix some style issues wrt #9081
2013-12-06 09:47:40 -07:00
John Spray
0376a5c42a
Wait for new time_t before updating AES key file
...
This is a mitigation for issue 8263, wherein the master
experiences a communications failure when multiple
key updates happen in one second. We reduce the chance
of this by checking time() against the mtime of the file
and waiting until they are not equal.
2013-12-06 09:46:45 -07:00
Thomas S Hatch
a5d8fbbf5b
Minior pylint fix per #9071
2013-12-06 09:33:20 -07:00
Thomas S Hatch
5684b8c3b8
Merge pull request #9071 from mikn/wheel-patch
...
Making opts optional for the Wheel python API. Addresses #9069
2013-12-06 08:38:38 -08:00
Thomas S Hatch
3eb5990d8c
make the file it not already there
2013-12-06 09:31:43 -07:00
Thomas S Hatch
f70b552d36
Merge pull request #9068 from mikn/develop
...
Mending some logical hula hoops in wheel/key.py. Fixing #9055
2013-12-06 08:36:55 -08:00
Thomas S Hatch
f360aa53b6
single quotes
2013-12-06 09:27:32 -07:00
Thomas S Hatch
7a17804653
single quotes
2013-12-06 09:25:33 -07:00
Thomas S Hatch
f5810fdc79
Merge pull request #9057 from ticosax/add-partial-support-docker-v1.6-api
...
Add partial support docker v1.6 api
2013-12-06 08:29:43 -08:00
Thomas S Hatch
eeee90ec8c
Fix opts test lookup
2013-12-06 09:18:31 -07:00
