Gareth J. Greenaway
|
1b4d398579
|
Merge branch '2018.3' into fluorine
Conflicts:
salt/modules/acme.py
|
2018-12-05 21:54:14 +01:00 |
|
Mike Place
|
a274b57614
|
Merge pull request #50741 from terminalmage/salt-jenkins-1223
Ensure that pure python dumper is used in PY3 for yamlex serializer
|
2018-12-05 07:53:26 -07:00 |
|
Daniel Wozniak
|
c02387ed1f
|
Merge pull request #50745 from bbinet/fix-grafana-dashboard-update
Fix grafana dashboard updating when nothing has changed
|
2018-12-04 12:26:31 -07:00 |
|
Bruno Binet
|
7019d47ce9
|
Fix grafana dashboard updating when nothing has changed
The new field "uid" (from grafana5) must be ignored: it will always
differ as it is generated server side by grafana when creating the
dashboard.
|
2018-12-04 18:19:51 +01:00 |
|
Daniel Wozniak
|
730bbde800
|
Merge pull request #50743 from dwoz/kub_conf
Older MacOS versions won't have TMPDIR environment
|
2018-12-04 10:09:42 -07:00 |
|
Daniel A. Wozniak
|
c53c046edf
|
Older MacOS versions won't have TMPDIR environment
|
2018-12-04 09:16:48 -07:00 |
|
Daniel Wozniak
|
ae81498a5e
|
Merge pull request #50737 from garethgreenaway/merge-2017.7
[develop] Merge forward from 2017.7 to 2018.8
|
2018-12-04 09:02:12 -07:00 |
|
Erik Johnson
|
31f62622c2
|
Ensure that pure python dumper is used in PY3 for yamlex serializer
|
2018-12-04 09:42:43 -06:00 |
|
Gareth J. Greenaway
|
fde8db5ef4
|
Merge branch '2017.7' into merge-2017.7
Conflicts:
tests/support/case.py
|
2018-12-04 15:53:04 +01:00 |
|
Daniel Wozniak
|
246c055676
|
Merge pull request #50718 from dwoz/run_run_timeout
Honor run_run timeout for shell tests
|
2018-12-03 09:00:23 -07:00 |
|
Daniel Wozniak
|
d9c5f57437
|
Merge pull request #50719 from dwoz/orchestrate_subset
Increase timeout on orchestrate subset test
|
2018-12-03 09:00:07 -07:00 |
|
Daniel A. Wozniak
|
6118bdffe0
|
Fix spacing
|
2018-12-02 15:40:09 -07:00 |
|
Daniel A. Wozniak
|
ff76255017
|
Increase timeout on orchestrate subset test
|
2018-12-02 15:34:16 -07:00 |
|
Daniel A. Wozniak
|
ba7c8ab1da
|
Honor run_run timeout for shell tests
|
2018-12-02 15:30:11 -07:00 |
|
Daniel A. Wozniak
|
ecd84863cd
|
Honor run_run timeout for shell tests
|
2018-12-02 15:21:17 -07:00 |
|
Daniel Wozniak
|
6b0f8d9c79
|
Merge pull request #50717 from dwoz/kub_darwin
Fix temp directory location on MacOS
|
2018-12-01 16:58:58 -07:00 |
|
Gareth J. Greenaway
|
4014d7251d
|
Merge pull request #50713 from dwoz/jinja_test
Fix failing jinja filter test
|
2018-12-01 15:37:49 -08:00 |
|
Gareth J. Greenaway
|
d7ce0395cd
|
Merge pull request #50716 from dwoz/skip_test
Skip Xen test when not linux
|
2018-12-01 15:31:18 -08:00 |
|
Daniel A. Wozniak
|
68e094d379
|
Fix temp directory locaiton on MacOS
|
2018-12-01 16:02:17 -07:00 |
|
Daniel A. Wozniak
|
b1c5ffbabc
|
Skip xen test when not linux
|
2018-12-01 15:41:10 -07:00 |
|
Daniel A. Wozniak
|
7a2cbbf659
|
Fix failing jinja filter test
|
2018-11-30 23:15:59 -07:00 |
|
Gareth J. Greenaway
|
979b3aa9e6
|
Merge pull request #50702 from damon-atkins/jenkins_pylint
Fixes/Improvements to ci/lint.
|
2018-11-30 20:45:22 -08:00 |
|
Mike Place
|
22acaaa4a1
|
Merge pull request #50632 from astronouth7303/loader-exception-handler
Better handle errors in entry points
|
2018-11-30 11:49:55 -07:00 |
|
Mike Place
|
edaa9fed03
|
Merge pull request #50685 from Ch3LL/merge_2018.3
[2018.3] Merge forward from 2017.7 to 2018.3
|
2018-11-30 11:46:06 -07:00 |
|
Mike Place
|
1b4938e274
|
Merge pull request #50686 from Ch3LL/merge_fluorine
[fluorine] Merge forward from 2018.3 to fluorine
|
2018-11-30 11:45:34 -07:00 |
|
Mike Place
|
7cb2405e48
|
Merge pull request #50690 from garethgreenaway/50016_ensure_path_is_str
[2018.3] fixes to augeas_cfg module
|
2018-11-30 11:44:41 -07:00 |
|
Mike Place
|
f779667c15
|
Merge pull request #50693 from garethgreenaway/1234_crypto_python3_x509_test_failures
[fluorine] Fixing unit.modules.test_x509 for Py3
|
2018-11-30 11:41:56 -07:00 |
|
Damon Atkins
|
5936066e62
|
ensure archiveArtifacts are always collected. Use CHANGE_BRANCH to detect merge-forward
|
2018-11-30 23:36:07 +11:00 |
|
Jamie Bliss
|
0f7281598c
|
Merge branch '2017.7' into loader-exception-handler
|
2018-11-29 22:51:58 -05:00 |
|
Jamie Bliss
|
194801a982
|
Merge branch 'loader-exception-handler' of github.com:astronouth7303/salt into loader-exception-handler
|
2018-11-29 22:51:37 -05:00 |
|
Jamie Bliss
|
869774480d
|
Use single quotes per style guide
|
2018-11-29 22:51:29 -05:00 |
|
Gareth J. Greenaway
|
afef38bc6f
|
Fixing unit.modules.test_x509 for Py3.
|
2018-11-29 14:47:50 -08:00 |
|
Gareth J. Greenaway
|
cec7cb4dc3
|
Older versions of python-augeas need the path passed to aug.match to be a string.
|
2018-11-29 11:50:45 -08:00 |
|
Ch3LL
|
49368667e5
|
Merge branch 2018.3 into fluorine
Conflicts:
- salt/returners/__init__.py
|
2018-11-29 13:27:26 -05:00 |
|
Ch3LL
|
d46aff05fc
|
Merge branch 2017.7 into 2018.3
Conflicts:
- salt/modules/file.py
|
2018-11-29 13:09:15 -05:00 |
|
Mike Place
|
a5c7639ecb
|
Merge pull request #50657 from terminalmage/issue49392
Rewrite host.present state to allow for removal of entries not matching IP
|
2018-11-29 10:58:39 -07:00 |
|
Mike Place
|
d9e7be1091
|
Merge pull request #50670 from damon-atkins/jenkins_pylint
Corrections to ci/lint from #50583
|
2018-11-29 10:52:26 -07:00 |
|
Mike Place
|
b604785c53
|
Merge pull request #50683 from garethgreenaway/48759_adding_aliases_include_expand
[2018.3] Fixes to acme module when adding aliases to existing certificate
|
2018-11-29 10:46:53 -07:00 |
|
Gareth J. Greenaway
|
3940a0fa68
|
When adding alises to an existing Certbot certificate, if we see a message about expanding in the stderr returned from cmd.run_all we should rerun the cmd with --expand included.
|
2018-11-29 09:24:28 -08:00 |
|
Damon Atkins
|
b6d1605f99
|
ci/lint corrected filenames and test condition on full lint
Also fix CODEOWNER team name
|
2018-11-29 23:44:11 +11:00 |
|
Gareth J. Greenaway
|
6dc3afce17
|
Merge pull request #50672 from garethgreenaway/49691_file_replace_search_only_return_false
[2017.7] fixes to file.replace with search_only
|
2018-11-28 14:17:02 -08:00 |
|
Jamie Bliss
|
dadeb0da0b
|
Merge branch '2017.7' into loader-exception-handler
|
2018-11-28 15:53:40 -05:00 |
|
Jamie Bliss
|
07868f1dfd
|
Improve logging output
|
2018-11-28 15:33:57 -05:00 |
|
Gareth J. Greenaway
|
7e7df06063
|
lint
|
2018-11-28 09:47:24 -08:00 |
|
Gareth J. Greenaway
|
6b73c7637f
|
When using file.replace, with the search_only option, if the pattern does not exist in the file then we should return False.
|
2018-11-28 09:47:24 -08:00 |
|
Erik Johnson
|
2ddb587e99
|
Add release notes for new "clean" option
|
2018-11-28 11:45:25 -06:00 |
|
Erik Johnson
|
e4946f9cec
|
Rename "remove" argument to "clean"
|
2018-11-28 11:41:48 -06:00 |
|
Mike Place
|
1236b519b4
|
Merge pull request #50659 from garethgreenaway/49954_gem_installed_less_than_greater_than_support
[2017.7] fixes to gem state when using greater than or less than versions
|
2018-11-28 10:38:59 -07:00 |
|
Daniel Wozniak
|
15f9ae4412
|
Merge pull request #50664 from garethgreenaway/50406_salt_ssh_returner_configuration
[2018.3] Fix to logic for configuring returners
|
2018-11-27 22:24:29 -07:00 |
|
Gareth J. Greenaway
|
35254116f3
|
When pulling values out of the available configuration for returners we should always default to using keys for those returners, eg. mongo.user for the username. Otherwise in certain situations, eg. when using salt-ssh we will end up with the wrong value for the user.
|
2018-11-27 18:44:11 -08:00 |
|