realjktu
1a7b12cb89
Merge branch 'develop' into keystone_sd
2017-10-23 10:46:49 +03:00
Tom Williams
76ec24be8a
Merge branch 'develop' into infra5825
2017-10-22 21:27:23 -04:00
Xavier G
c0a5880d32
grafana4: datasource: handle missing keys in datasource description.
2017-10-22 16:36:10 +02:00
Xavier G
5dd9fe8918
grafana4: dashboard: do not override the title.
...
grafana4_dashboard.present() was liable to override the user-provided dashboard
title with its name (which is actually the slug, as hinted in the documentation
of grafana4.get_dashboard()). It makes sense for grafana4_dashboard.present()
to enforce a title to fulfill Grafana's requirements, but the slug (normalized,
non-numerical, URL-friendly identifier) should be used as a title
(human-friendly identifier) only as a last resort.
2017-10-22 16:21:19 +02:00
me
f19e50a351
change service to process in module docstring
2017-10-22 11:02:04 +03:30
Eric Radman
10d13062ec
Mock open to /var/log/btmp and /var/log/wtmp
...
- btmp may not exist
- wtmp may not exist, or it may not contain ASCII data
Unbreaks tests on OpenBSD 6.2
2017-10-21 09:50:08 -04:00
Nicole Thomas
818100b8e7
Merge pull request #44218 from SaltyCharles/patch-15
...
fix typo
2017-10-20 17:01:34 -04:00
SaltyCharles
74622436e4
fix typos
...
fix typos for clarity
2017-10-20 14:01:05 -07:00
Nicole Thomas
3fe1a1387d
Merge pull request #44223 from SaltyCharles/patch-20
...
fix typo
2017-10-20 17:00:56 -04:00
Nicole Thomas
947727f23c
Merge pull request #44222 from SaltyCharles/patch-19
...
fix typo
2017-10-20 17:00:29 -04:00
Nicole Thomas
a9267439fd
Merge pull request #44219 from SaltyCharles/patch-16
...
fix typo
2017-10-20 16:59:34 -04:00
SaltyCharles
1f91ee9d78
fix typo
...
fix typo for clarity
2017-10-20 13:57:58 -07:00
Nicole Thomas
4f8365dc82
Merge pull request #44216 from SaltyCharles/patch-13
...
fix typo
2017-10-20 16:57:04 -04:00
Nicole Thomas
726288d3f6
Merge pull request #44215 from SaltyCharles/patch-12
...
fix typo
2017-10-20 16:56:32 -04:00
SaltyCharles
3b46743207
fix typo
...
fix typo for clarity
2017-10-20 13:56:04 -07:00
Nicole Thomas
eab00041b5
Merge pull request #44212 from SaltyCharles/patch-10
...
fix typos
2017-10-20 16:56:02 -04:00
Nicole Thomas
4eae6ecd29
Merge pull request #44213 from SaltyCharles/patch-11
...
fix typo
2017-10-20 16:55:24 -04:00
SaltyCharles
0ed4f5533d
fix typo
...
fix typo for clarity
2017-10-20 13:54:40 -07:00
SaltyCharles
a2a1a4be9c
fix typo
...
fix typo for clarity
2017-10-20 13:53:28 -07:00
SaltyCharles
06047f6454
fix typo
...
fix typo for clarity
2017-10-20 13:51:12 -07:00
SaltyCharles
7da57b8771
fix typo
...
fix typo/grammar for clarity
2017-10-20 13:49:19 -07:00
SaltyCharles
9b505d955b
fix typos
...
fix typos for clarity
2017-10-20 13:45:41 -07:00
SaltyCharles
730c1a390f
fix typo
...
fix typo for clarity
2017-10-20 13:41:44 -07:00
SaltyCharles
e33c94a89b
fix typos
...
fix typos for clarity
2017-10-20 13:27:59 -07:00
SaltyCharles
3d068357c1
fix typos
...
fix typos for clarity
2017-10-20 13:25:14 -07:00
SaltyCharles
56e23f8773
fix typo
...
fix typo for clarity
2017-10-20 13:18:50 -07:00
SaltyCharles
6d5409efb8
fix typo
...
fix typo for clarity
2017-10-20 13:13:16 -07:00
SaltyCharles
580feea5a7
fix typos
...
fix typo's for clarity
2017-10-20 13:10:36 -07:00
Alex moore
f879f322a6
Revert changes to pgjsonb from 553aaad105
2017-10-20 14:04:20 -06:00
Alex moore
785f33558d
Merge branch 'develop' of github.com:almoore/salt into develop
2017-10-20 14:02:50 -06:00
rallytime
098f4cfec8
Merge branch '2017.7' into merge-develop
2017-10-20 12:44:39 -04:00
Nicole Thomas
d7dc2bd0e8
Merge pull request #44208 from twangboy/win_fix_group.present
...
Fix some lint in PR: 44080
2017-10-20 12:42:01 -04:00
twangboy
61e2e9ccda
Fix some lint
2017-10-20 09:59:54 -06:00
Sergey Kacheev
e9699de94c
Merge branch 'develop' into fix_requests_ssl_verify_error
2017-10-20 22:57:24 +07:00
Sergey Kacheev
b9f7b41f95
add ".. versionadded:: Oxygen" tag
2017-10-20 22:54:53 +07:00
Vernon Cole
b7c0182d93
correct and clarify documentation
2017-10-20 09:24:26 -06:00
Nicole Thomas
a7a841d9d2
Merge branch '2017.7' into git-noexec-fix
2017-10-20 11:08:20 -04:00
garethgreenaway
1227c54626
Merge pull request #44204 from rallytime/stale-config-update
...
Reduce the number of days an issue is stale by 25
2017-10-20 08:07:27 -07:00
Nicole Thomas
012477071f
Merge pull request #44071 from garethgreenaway/various_beacon_fixes
...
[develop] Various fixes to beacons
2017-10-20 11:06:27 -04:00
rallytime
c830f0f8f4
Add some space in new opsgenie docs for rst formmating
...
Follow up to #43821
These fixes will help the docs render correctly with the various
examples given.
2017-10-20 10:59:37 -04:00
Senthilkumar Eswaran
b9940f8521
Fixing default redis.host in documentation
2017-10-20 10:55:41 -04:00
rallytime
9da66a2bb9
Reduce the number of days an issue is stale by 25
2017-10-20 10:53:11 -04:00
rallytime
3b9d02977d
Update deprecated salt.utils paths to new salt.utils.x paths
2017-10-20 10:48:37 -04:00
rallytime
2617cf851f
Merge branch '2017.7' into 'develop'
...
Conflicts:
- salt/modules/aptpkg.py
- salt/utils/win_functions.py
- tests/unit/states/test_mount.py
2017-10-20 10:44:29 -04:00
rallytime
99ff7a5c12
Merge branch '2016.11' into '2017.7'
...
Conflicts:
- salt/utils/virtualbox.py
2017-10-20 10:36:37 -04:00
Oleg Iurchenko
f3f3090794
Fix Salt CI issues
2017-10-20 14:35:26 +00:00
Nicole Thomas
c6d27ada51
Merge pull request #43843 from twangboy/win_unit_test_mount
...
Fix `unit.states.test_mount` for Windows
2017-10-20 10:27:25 -04:00
Nicole Thomas
09ddfd0c08
Merge pull request #44167 from garethgreenaway/44140_debian_ip_fixes
...
Fixes to modules/debian_ip
2017-10-20 10:25:38 -04:00
Daniel Wallace
a7d3d668f4
missed removing changes in the next test
2017-10-20 08:11:44 -06:00
Nicole Thomas
4b0f177adf
Merge pull request #43838 from bodhi-space/infra5669_2
...
INFRA-5669 - add retry loops for API rate limiting in ELB health_check funcs
2017-10-20 10:04:59 -04:00
