Merge branch '7.8'

Author: at055612

ci_build.sh

@@ -141,8 +141,8 @@ replace_versions_block() {
   #echo -e "${GREEN}Dumping versions section:"
   #awk '/^.*<<<VERSIONS_BLOCK_START>>>.*$/,/^.*<<<VERSIONS_BLOCK_END>>>.*$/' \
     #"${config_file}"
-  echo -e "${GREEN}Dumping config file ${BLUE}${config_file}${GREEN}:${NC}"
-  cat "${config_file}"
+  #echo -e "${GREEN}Dumping config file ${BLUE}${config_file}${GREEN}:${NC}"
+  #cat "${config_file}"
 }
 
 build_version_from_source() {

content/en/releases/v07.08/breaking-changes.md

@@ -12,6 +12,13 @@ description: >
 Please read this section carefully in case any of the changes affect you.
 {{% /warning %}}
 
+## Stroom
+
+#### Service Discovery
+
+See [Configuration File Changes (Service Discovery)]({{< relref "./upgrade-notes#service-discovery" >}}).
+
+
 ## Stroom-Proxy
 
 The new implementation of Stroom-Proxy is not compatible with previous versions.
@@ -27,6 +34,3 @@ You have two options:
    Install the new v7.8 Stroom-Proxy.
    Allow data to flow in again.
 
-
-
-

content/en/releases/v07.08/upgrade-notes.md

@@ -31,6 +31,17 @@ git diff origin/${old_ver}..origin/${new_ver} stroom-proxy/stroom-proxy-app/src/
 
 ### Stroom's `config.yml`
 
+#### Service Discovery
+
+If your `config.yml` file contains the `serviceDiscovery` branch, you need to remove it as the associated service discovery code has been removed from Stroom.
+If you do not remove it, Stroom will not boot.
+
+```yml
+appConfig:
+  serviceDiscovery:  # Remove this branch
+```
+
+
 #### Plan B State Store
 
 The following block of config has been added for the experimental Plan B State Store.