summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2017-05-15 13:49:23 +0000
committerDouwe Maan <douwe@gitlab.com>2017-05-15 13:49:23 +0000
commitf5e5afc7901b646ab26130893bcbccbe5452db18 (patch)
treec41bb4a5ee947b7581838f9233846deff5db343a /changelogs
parente2ffb8698751769879e21626c79f9c607a630bf5 (diff)
parent6bc48d0e25668a6cd6810178e68adab6fca58dae (diff)
downloadgitlab-ce-f5e5afc7901b646ab26130893bcbccbe5452db18.tar.gz
Merge branch 'adam-influxdb-hostname' into 'master'
Allow GitLab instance to start when InfluxDB hostname cannot be resolved Closes #24438 See merge request !11356
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/adam-influxdb-hostname.yml4
1 files changed, 4 insertions, 0 deletions
diff --git a/changelogs/unreleased/adam-influxdb-hostname.yml b/changelogs/unreleased/adam-influxdb-hostname.yml
new file mode 100644
index 00000000000..ab201ae7894
--- /dev/null
+++ b/changelogs/unreleased/adam-influxdb-hostname.yml
@@ -0,0 +1,4 @@
+---
+title: Allow GitLab instance to start when InfluxDB hostname cannot be resolved
+merge_request: 11356
+author: