Arthur Deschamps
5c4bee43dc
correct accept_vpc_peering_connection
2017-12-13 13:13:12 -05:00
Nicole Thomas
1032ca3290
Merge pull request #44385 from gtmanfred/schedule
...
schedule should be a dict in opts
2017-12-12 15:44:01 -05:00
Nicole Thomas
68d901b12c
Merge pull request #44770 from cruscio/2016.11
...
Fix minion ping_interval documentation
2017-12-11 14:50:18 -05:00
Nicole Thomas
d4ab55ec47
Merge pull request #44335 from gtmanfred/2016.11
...
add docker-ce to docker subtype grains check
2017-12-10 12:17:49 -05:00
Daniel Wallace
9e15c38da2
add comma
2017-12-07 14:26:10 -07:00
Daniel Wallace
855d933cb7
schedule should be a dict
...
set scheduler configuration in salt.config
2017-12-07 14:07:39 -07:00
Gareth J. Greenaway
bb1f8dceaf
Merge pull request #44579 from roaldnefs/fix-cron-identifier
...
Fix bug in cron module and state - Fixes #44530
2017-12-07 12:18:26 -08:00
Gareth J. Greenaway
df73a4c051
Merge branch '2016.11' into fix-cron-identifier
2017-12-07 12:13:37 -08:00
Daniel Wallace
3f1268d67f
fix patching for python 2.6
2017-12-07 08:25:26 -07:00
Nicole Thomas
af0131fa1f
Merge pull request #44852 from damon-atkins/2016.11_win_pkg_typo_n_fix
...
win_pkg fix spelling typos and minion option 2016.11
2017-12-06 11:49:16 -05:00
Nicole Thomas
0e7c19084f
Lint: Remove extra whitespace
2017-12-06 10:38:19 -05:00
Damon Atkins
7c7e21f94d
Fix spelling typo, and fix backwards campatible minion option for repo location
2017-12-07 00:54:16 +11:00
Daniel Wallace
1d0bd5bb32
Merge branch '2016.11' into 2016.11
2017-12-04 10:13:15 -07:00
Nicole Thomas
88c0d66b4e
Merge pull request #44794 from terminalmage/issue44365
...
Fix regression in file.managed when source_hash used with local file
2017-12-04 09:23:28 -05:00
Nicole Thomas
3b8b6f25e6
Remove debugging line
2017-12-04 09:22:44 -05:00
Erik Johnson
153bf45b03
Fix regression in file.managed when source_hash used with local file
...
This ensures that we enforce the passed source_hash when the source is a
file local to the minion.
2017-12-03 00:01:44 -06:00
Thomas S Hatch
c8bb9dfbbb
Merge pull request #44738 from rallytime/bump-oxygen-warnings
...
Bump some deprecation warnings from Oxygen to Fluorine
2017-12-01 16:10:07 -07:00
Thomas S Hatch
88e3aab00d
Merge pull request #44741 from gtmanfred/rhip
...
if gateway is not specified use iface
2017-12-01 16:09:02 -07:00
Nicole Thomas
97e0cf569c
Merge pull request #44699 from jfindlay/attr_file
...
utils/files.py remove temp file upon move failure
2017-12-01 10:03:53 -05:00
Nicole Thomas
7434e0afdf
Merge pull request #44714 from rallytime/fix-44556
...
Allow --static option to display state runs with highstate output
2017-12-01 09:31:18 -05:00
Justin Findlay
9e5a40ea7c
Merge branch '2016.11' into attr_file
2017-11-30 16:34:43 -08:00
chris ruscio
e2682bf441
Fix minion ping_interval documentation
2017-11-30 13:56:10 -05:00
Daniel Wallace
439dc8dce6
if gateway is not specified use iface
...
This will allow for the route to be applied to drop the packets on that
interface.
2017-11-29 10:31:52 -07:00
rallytime
ead3c569e1
Bump deprecation warnings from Oxygen to Fluorine
...
The following files had deprecation warnings for "Oxygen" that should
be handled in the next feature release (Fluorine):
- salt/client/mixins.py
- salt/states/lxc.py
- salt/utils/__init__.py
2017-11-29 12:06:27 -05: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
rallytime
1bbe1abeb2
Allow --static option to display state runs with highstate output
...
Fixes #44556
2017-11-28 13:10:37 -05: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
Daniel Wallace
f02b02032d
Merge pull request #4 from terminalmage/pr-44335
...
Add test for PR 44335
2017-11-27 09:31:38 -07:00
Erik Johnson
b4eb1527a6
Add test for PR 44335
...
This also modifies the virtual_subtype code slightly, due to an issue I
noticed in testing. We were reading from `/proc/1/cgroup` twice (once
for LXC, and then again for Docker).
2017-11-25 14:32:43 -06:00
Nicole Thomas
1b64f15692
Merge branch '2016.11' into add_grain_tests
2017-11-22 11:22:44 -05:00
Roald Nefs
3ec4329307
Merge branch '2016.11' into fix-cron-identifier
2017-11-22 09:19:31 +01: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
Roald Nefs
99fa05a456
Fix for bug in cron state
...
- Updated the cron state accordingly to the bug fixes in the cron module.
Fixes #44530
2017-11-16 23:32:02 +01:00
Roald Nefs
97328faeac
Fix for bug in cron module
...
- Updated the set_special function to allow a identifier, comment and commented value to be set just like the set_job function;
- Updated the rm_special, list_tab and _render_tab methods accordingly.
2017-11-16 22:54:59 +01: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
