Nicole Thomas
|
16c382b55b
|
Merge pull request #46121 from rallytime/merge-2017.7
[2017.7] Merge forward from 2016.11 to 2017.7
|
2018-02-21 05:07:17 -05:00 |
|
Bo Maryniuk
|
5149cdbbd9
|
Fix unit test for py3
|
2018-02-21 10:53:20 +01:00 |
|
Daniel Wallace
|
9ce14b2a12
|
pass opts to SSHClient for enable_ssh_minions
Also, use ckminions to get the minions from the roster, instead of doing it in
publish.
|
2018-02-20 16:06:00 -07:00 |
|
Nicole Thomas
|
b92346645b
|
Merge pull request #46107 from amendlik/yumpkg-assumeyes
Add --assumeyes on YUM/DNF commands
|
2018-02-20 17:52:05 -05:00 |
|
Nicole Thomas
|
772636f67a
|
Merge pull request #46084 from garethgreenaway/oxygen_swap_to_datetime_objects
[oxygen] swap scheduler to use datetime objects
|
2018-02-20 17:51:26 -05:00 |
|
Nicole Thomas
|
49c1fc6faf
|
Merge pull request #46088 from rongzeng54/master
fix kernel subpackages install bug
|
2018-02-20 17:50:46 -05:00 |
|
Nicole Thomas
|
8f245ea62e
|
Merge pull request #46069 from rallytime/bp-46036
Back-port #46036 to oxygen.rc1
|
2018-02-20 17:50:17 -05:00 |
|
rallytime
|
4c2f504a85
|
Merge branch '2016.11' into '2017.7'
No conflicts.
|
2018-02-20 17:43:33 -05:00 |
|
gwiyeong
|
fa4270c53e
|
Fixes memory leak, saltclients should be cleaned after used.
|
2018-02-20 17:01:20 -05:00 |
|
gwiyeong
|
f063cdcae1
|
Adds set_close_callback function to removes stream instance after closed from a set streams.
|
2018-02-20 17:01:20 -05:00 |
|
Ollie Armstrong
|
2a2c23c66b
|
Fix acme state to correctly return on test
Previously, the acme.cert state would return that a change was pending
during a test run even in the case that the certificate would not have
been touched.
Changed the return value in this case so that it is not thought to
require a change.
This is reported in #40208 [0] and is also referenced in #42763 [1].
The issue #40208 looks to go on to recommend further changes beyond the
scope of this 'quick fix'.
[0] https://github.com/saltstack/salt/issues/40208#issuecomment-289637588
[1] https://github.com/saltstack/salt/issues/42763#issuecomment-345728031
|
2018-02-20 16:50:50 -05:00 |
|
Nicole Thomas
|
93dab45307
|
Merge pull request #46078 from rallytime/merge-oxygen
[oxygen] Merge forward from oxygen.rc1 to oxygen
|
2018-02-20 16:49:04 -05:00 |
|
Nicole Thomas
|
e197a0fbc5
|
Merge pull request #46076 from rallytime/bp-46066
Back-port #46066 to 2016.11
|
2018-02-20 16:48:41 -05:00 |
|
Nicole Thomas
|
93c389ee5e
|
Merge pull request #46112 from terminalmage/salt-jenkins-825
Fix failure to build docs in develop branch
|
2018-02-20 16:41:48 -05:00 |
|
Nicole Thomas
|
14fe423e0c
|
Merge pull request #46094 from kstreee/fix-memory-leak
Fix memory leak
|
2018-02-20 16:36:01 -05:00 |
|
Nicole Thomas
|
60ee64af40
|
Merge pull request #46029 from areaxx/develop
[#46028] do the version check with packaging AND classifier
|
2018-02-20 16:35:10 -05:00 |
|
Nicole Thomas
|
4b8cb89d27
|
Merge pull request #46114 from Ch3LL/mac_sysctl
Ensure new line is added to file in mac sysctl.present
|
2018-02-20 16:30:19 -05:00 |
|
Nicole Thomas
|
b1907c0ef2
|
Merge pull request #45689 from rrroo/sentry_mod_exclude_patterns
Add "exclude_patterns" option to Sentry log handler.
|
2018-02-20 16:29:08 -05:00 |
|
Nicole Thomas
|
551f7a6280
|
Merge pull request #46057 from terminalmage/unicode-normalization
Add unicode normalization support to data/stringutils helpers
|
2018-02-20 16:26:09 -05:00 |
|
Ch3LL
|
1fd0295cca
|
Add stringutils.to_str in test_roster_config_validate test
|
2018-02-20 16:22:15 -05:00 |
|
Nicole Thomas
|
a257ec9aaf
|
Merge branch 'develop' into develop
|
2018-02-20 16:19:33 -05:00 |
|
rallytime
|
d499251137
|
Update stringutils path in reg state to use new location
|
2018-02-20 16:16:23 -05:00 |
|
Nicole Thomas
|
0dc8d17540
|
Merge pull request #46104 from isbm/isbm-x509fixonfix
x509 fix update
|
2018-02-20 16:08:23 -05:00 |
|
Nicole Thomas
|
7088438930
|
Merge pull request #46002 from isbm/isbm-zeromq17-deprecationwarning
Pyzmq 17.0.0 proper handling
|
2018-02-20 16:07:06 -05:00 |
|
Volodymyr Samodid
|
0fe52c253d
|
update digitalocean salt-cloud driver
fix #45837
|
2018-02-20 23:04:17 +02:00 |
|
Nicole Thomas
|
652e59eb77
|
Merge pull request #45998 from terminalmage/issue45954
Retry loading serialized job details
|
2018-02-20 15:58:44 -05:00 |
|
rrzaripov
|
02326cef03
|
Change versionadded to Fluorine in win_network.is_private docs
|
2018-02-20 22:44:41 +03:00 |
|
rrzaripov
|
9113f06ee6
|
Merge branch 'update_win_network_ip_addrs' of https://github.com/rrzaripov/salt into update_win_network_ip_addrs
|
2018-02-20 22:41:41 +03:00 |
|
Renat Zaripov
|
bb412993dc
|
Merge branch 'develop' into update_win_network_ip_addrs
|
2018-02-20 22:32:28 +03:00 |
|
Gareth J. Greenaway
|
d15c8522b9
|
Fixing slight typo related to reverting _run_explicit back to run_explicit.
|
2018-02-20 11:17:59 -08:00 |
|
Gareth J. Greenaway
|
e8b0e64bf5
|
Removing debugging code
|
2018-02-20 11:11:24 -08:00 |
|
Pedro Algarvio
|
743d717c27
|
Lint fixes
|
2018-02-20 11:07:58 -08:00 |
|
Gareth J. Greenaway
|
6a96d66986
|
merge conflict
|
2018-02-20 11:07:04 -08:00 |
|
Gareth J. Greenaway
|
7e4974d5a4
|
merge conflict
|
2018-02-20 11:01:44 -08:00 |
|
Gareth J. Greenaway
|
4b83bd5428
|
Fixing lint, unused imports
|
2018-02-20 10:44:12 -08:00 |
|
Gareth J. Greenaway
|
5a90e6db9e
|
merge conflict
|
2018-02-20 10:42:40 -08:00 |
|
Gareth J. Greenaway
|
1a636b1c71
|
Fixing typo. swapping out a format string for an additional with datetime.timedelta.
|
2018-02-20 10:34:57 -08:00 |
|
Gareth J. Greenaway
|
b5bde4e904
|
Fixing cron based schedule logic up. Removing debugging messages.
|
2018-02-20 10:34:56 -08:00 |
|
Gareth J. Greenaway
|
e9ebfc8226
|
swapping the scheduler to use datetime objects internally
|
2018-02-20 10:34:31 -08:00 |
|
Ch3LL
|
00efcb418a
|
Ensure new line is added to file in mac sysctl.present
|
2018-02-20 13:22:56 -05:00 |
|
Gareth J. Greenaway
|
29fea7c550
|
Updating skip_job and postpone_job to acceept date strings. Reverting skip_explicit and run_explicit to not be prefixed by an undercore.
|
2018-02-20 10:01:20 -08:00 |
|
Pedro Algarvio
|
cb68c12e7a
|
Lint fixes
|
2018-02-20 10:01:19 -08:00 |
|
Gareth J. Greenaway
|
e018e2b9cd
|
Fixing a lint issue. Invalid syntax.
|
2018-02-20 10:01:19 -08:00 |
|
Gareth J. Greenaway
|
5e15c28dfa
|
Swapping skip_job and postpone_job to send time in date string format instead of passing datetie objects across the event bus. Updating tests tto reflect changes. Updating others which fail when run with --scheduler option but run fine individually.
|
2018-02-20 10:01:19 -08:00 |
|
Gareth J. Greenaway
|
f928e2842c
|
Fixing skip_job and postpone_job following the internal switch to datetime objects, these two will now accept date strings with an option format. Moved the various internal variables that end up being datetime objects to be prefixed with an underscores, to indicate that they're internal variables. Updating the _get_schedule to accept a new parameter indicating whehter hidden variables should be shown. Updating the various functions that call _get_schedule and then return the results in an event to not include hidden variables.
|
2018-02-20 10:01:19 -08:00 |
|
Gareth J. Greenaway
|
d37ac991a6
|
Fixing lint, unused imports
|
2018-02-20 10:01:19 -08:00 |
|
Gareth J. Greenaway
|
2559815eb5
|
Adding tests for after and until. Updating schedule unit tests. Adding skip_reason and friends for those two cases. Moving them to the end for evaluation.
|
2018-02-20 10:01:19 -08:00 |
|
Gareth J. Greenaway
|
72cc4a804e
|
Fixing until and after options
|
2018-02-20 10:01:18 -08:00 |
|
Gareth J. Greenaway
|
5b1b856103
|
Removing unnecessary variable assignment.
|
2018-02-20 10:01:18 -08:00 |
|
Gareth J. Greenaway
|
f62f93c892
|
Fixing typo. swapping out a format string for an additional with datetime.timedelta.
|
2018-02-20 10:01:18 -08:00 |
|