Justin Findlay
9e5a40ea7c
Merge branch '2016.11' into attr_file
2017-11-30 16:34:43 -08:00
Gareth J. Greenaway
998d714ee7
Merge pull request #44517 from whytewolf/publish_port_doc_missing
...
Publish port doc missing
2017-11-28 13:50:18 -08:00
Justin Findlay
5c34607f6c
utils/files remove temp file upon move failure
...
Fixes #31405 .
2017-11-28 09:43:58 -08:00
Nicole Thomas
6169b52749
Merge pull request #41279 from Ch3LL/add_grain_tests
...
Add fqdn and dns core grain tests
2017-11-27 16:28:09 -05:00
Nicole Thomas
1b64f15692
Merge branch '2016.11' into add_grain_tests
2017-11-22 11:22:44 -05:00
C. R. Oldham
dc6de050a9
Merge pull request #44563 from creideiki/pgjsonb-timestamps-44544
...
Send Unix timestamps to database in pgjsonb returner
2017-11-21 10:44:31 -07:00
C. R. Oldham
231e412ca4
Merge branch '2016.11' into pgjsonb-timestamps-44544
2017-11-21 10:44:01 -07:00
Nicole Thomas
4369df020b
Merge pull request #44602 from rallytime/fix-44601
...
Handle timeout_monitor attribute error for new versions of CherryPy
2017-11-20 16:38:39 -05:00
Mike Place
4a4756fc37
Merge pull request #44604 from lorengordon/doc-exclude
...
Documents the exclude argument in state execution module
2017-11-20 18:19:18 +00:00
rallytime
ff303fd060
Handle timeout_monitor/TimeoutError issues for new versions of CherryPy
...
Fixes #44601
2017-11-20 13:12:40 -05:00
Nicole Thomas
095f1b7d7a
Merge branch '2016.11' into add_grain_tests
2017-11-20 11:14:34 -05:00
Loren Gordon
c4a6c40eb3
Documents the exclude argument in state execution module
2017-11-20 11:08:37 -05:00
Karl-Johan Karlsson
15c445e6b9
Send Unix timestamps to database in pgjsonb
...
The pgjsonb returner wants a database with a timestamp column using
the type TIMESTAMP WITH TIME ZONE. Despite this, it's inserted its
timestamps as a date-time-zone string. This means that the minion has
needed to waste time formatting the timetamp, and then PostgreSQL has
wasted even more time parsing it back into a Unix timestamp for
storage.
Also, the code has been buggy on Python 2, which doesn't properly
support the %z format specifier to strftime() and has therefore sent
timestamps using the wrong time zone.
Solve both these problems by having the minion retrieve a Unix
timestamp by calling time.time(), sending it unmolested to PostgreSQL,
and using the PostgreSQL function to_timestamp() to store it.
Closes #44544 .
2017-11-16 10:14:12 +01:00
Ch3LL
9ea4db4224
mock socket.getaddrinfo
2017-11-14 14:39:15 -05:00
Ch3LL
78a07e30f4
add more fqdn tests and remove some of the mocking
2017-11-14 11:39:35 -05:00
Ch3LL
5dbf4144ce
add ipv6 in opts
2017-11-14 11:39:35 -05:00
Ch3LL
eabc1b4f9c
Add fqdn and dns core grain tests
2017-11-14 11:39:31 -05:00
Nicole Thomas
91d46d4cfc
Merge pull request #44434 from whytewolf/1837
...
add a note that describes grain rebuilding on restart and refresh
2017-11-14 06:21:53 -05:00
Thomas Phipps
d148e39dda
change from md to rst for code reference
2017-11-13 15:15:13 -07:00
Nicole Thomas
a3bd99317f
Merge pull request #44321 from gvengel/fix-file-line-diff-output
...
Fix file.line diff formatting.
2017-11-13 14:36:38 -05:00
Mike Place
9ca563718d
Merge pull request #43708 from damon-atkins/2016.11_43417_Backport_and_Fixes
...
Merge Ready : Backport develop win_pkg to 2016.11 with additional bug fixes
2017-11-13 12:33:40 -07:00
Thomas Phipps
4b5855283a
missed one place where i didnt chanbge master_port from my copy to publish_port
2017-11-13 12:21:34 -07:00
Thomas Phipps
e4610baea5
update doc to have publish port
2017-11-13 12:14:13 -07:00
Thomas Phipps
955e305bda
fix bad english, as requested by cachedout
2017-11-13 11:49:30 -07:00
Mike Place
69a50204a6
Add newline for lint.
2017-11-13 11:16:33 -07:00
Mike Place
68ea22188e
Merge pull request #44477 from rallytime/bp-44424
...
Back-port #44424 to 2016.11
2017-11-13 10:33:28 -07:00
Mike Place
2c89050a24
Merge pull request #44483 from terminalmage/issue44034
...
salt-call: account for instances where __pillar__ is empty
2017-11-13 10:30:35 -07:00
Mike Place
b5c2028680
Merge pull request #44489 from whytewolf/1956_log-granular-levels
...
update log-granular-levels to describe what they are filtering on
2017-11-13 10:27:36 -07:00
Gabe Van Engel
ef7b6bbb81
Fixed issue with file.line on Windows running Python 2.
...
The target file was being read as binary, but written as text, causing file.line to append an extra linesep on every line.
Added integration test to ensure file.line produces the expected content.
2017-11-12 23:55:35 -08:00
Gabe Van Engel
8f89c99fa5
Fix FileModuleTest setUp and tearDown to work on Windows.
2017-11-12 23:55:35 -08:00
Gabe Van Engel
3ac5391f5f
Namespace missing functions for file.line on Windows.
2017-11-12 23:55:34 -08:00
Gabe Van Engel
b2b8f075b9
Fixed test to work on Windows.
2017-11-12 23:55:34 -08:00
Gabe Van Engel
5a5a2dd026
Added integration test for issue #41474
2017-11-12 23:55:33 -08:00
Gabe Van Engel
24d7315f1a
Fix file.line diff formatting.
...
Using _splitlines_preserving_trailing_newline() strips off line
endings, mangling the unified_diff output. Switching to splitlines
with the keepends option resolves this issue, while still
preserving trailing newline.
Fixes #41474
2017-11-12 23:54:54 -08:00
Mike Place
ea07f9c54c
Merge pull request #44193 from twangboy/win_fix_reg
...
Fix reg.py for use with LGPO module
2017-11-10 12:01:16 -07:00
Nicole Thomas
ed8da2450b
Merge pull request #43863 from nicholasmhughes/fix-atomicfile-permission-copy
...
Atomicfile only copies mode and not user/group perms
2017-11-10 11:47:54 -07:00
Erik Johnson
a9db8becea
salt-call: account for instances where __pillar__ is empty
...
A regression was introduced in 8d6fdb7
2017-11-10 10:47:20 -06:00
mtkennerly
4a9f8dcc96
Fix #44423 : Handle index=None and index=0 distinctly
2017-11-10 10:24:34 -05:00
twangboy
44d6d9f46d
Remove unused import (lint)
2017-11-09 14:18:15 -07:00
twangboy
f7502436bd
Fix various issues
...
Fix state to handle unicode
Simplify type conversion logic
Handle binary values correctly
2017-11-09 14:18:15 -07:00
twangboy
221e6e3b91
make salt.utils.to_unicode return none when passed none
2017-11-09 14:18:15 -07:00
twangboy
ce41acc788
Fix many issues with reg.py
...
Remove _winreg dependency
Do ALL the things with win32api
Use salt.utils.to_unicode for all unicode conversions
Only use mbcs for returned values
salt.utils.to_unicode returns None if the passed value is None
2017-11-09 14:18:15 -07:00
twangboy
4a19df1f7f
Use six.text_type instead of str
2017-11-09 14:18:14 -07:00
twangboy
1b12acd303
Check type before casting
2017-11-09 14:18:14 -07:00
twangboy
03fa37b445
Cast vdata to it's proper type
2017-11-09 14:18:14 -07:00
Thomas Phipps
7256fcc1c9
update note to take into account grains_cache
2017-11-08 16:36:38 -08:00
Thomas Phipps
9cdeb4e903
update log-granular-levels to describe what they are filtering on
2017-11-08 16:11:46 -08:00
Thomas Phipps
7a2981585e
Merge branch '2016.11' into 1837
2017-11-07 15:40:39 -08:00
Nicole Thomas
a66cd67d15
Merge pull request #44260 from seanjnkns/issue-39901
...
Fixes #39901 for RH/CentOS 7
2017-11-07 16:14:58 -07:00
Thomas Phipps
aca0405b26
add a note that describes grain rebuilding on restart and refresh
2017-11-07 14:51:32 -08:00
