Merge pull request #43 from ria-ee/7.4.1

7.4.1
ria-ee · Mar 1, 2024 · 1b7ab59 · 1b7ab59
2 parents b0bdfdc + 545a54c
commit 1b7ab59
Show file tree

Hide file tree

Showing 53 changed files with 20,924 additions and 10,428 deletions.
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 This repository contains end user documentation for latest X-Road version of Estonian production environment.
 
-Current Estonian production version is: **7.4.0**
+Current Estonian production version is: **7.4.1**
 
 Directory [md](md) contains documentation source in Markdown format. These documents may be updated with Estonia specific parameters and therefore may differ from the original documents in
 [X-Road](https://github.com/ria-ee/X-Road/tree/develop/doc) repository.

diff --git a/automatics/md_prev/Monitoring-architecture.md b/automatics/md_prev/Monitoring-architecture.md
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 # X-Road: Environmental Monitoring Architecture
 
 Version: 1.10  
@@ -413,3 +414,5 @@ JMX API, in case port and network access is enabled, will provide monitoring dat
 Request for monitor data can be set for limiting optional parts by changing env-monitor.limit-remote-data-set parameter. By limiting data set environmental monitoring will return only proxyVersion, OperatingSystem and Certificate information. 
 
 If request parameters are used and flag is set for limiting, response will include proxyVersion, name and OperatingSystem and/or Certificate information if they are in parameter list and nothing else.
+=======
+>>>>>>> main
diff --git a/automatics/md_prev/Monitoring-messages.md b/automatics/md_prev/Monitoring-messages.md
diff --git a/automatics/md_prev/README.md b/automatics/md_prev/README.md
diff --git a/automatics/md_prev/ig-xlb_x-road_external_load_balancer_installation_guide.md b/automatics/md_prev/ig-xlb_x-road_external_load_balancer_installation_guide.md
diff --git a/automatics/md_prev/pr-gconf_x-road_protocol_for_downloading_configuration.md b/automatics/md_prev/pr-gconf_x-road_protocol_for_downloading_configuration.md
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 # X-Road: Protocol for Downloading Configuration
 
 **Technical Specification**
@@ -1568,3 +1569,5 @@ Changes in version 3:
   </complexType>
 </schema>
 ```
+=======
+>>>>>>> main
diff --git a/automatics/md_prev/pr-mess_x-road_message_protocol.md b/automatics/md_prev/pr-mess_x-road_message_protocol.md
diff --git a/automatics/md_prev/pr-messtransp_x-road_message_transport_protocol.md b/automatics/md_prev/pr-messtransp_x-road_message_transport_protocol.md
diff --git a/automatics/md_prev/pr-meta_x-road_service_metadata_protocol.md b/automatics/md_prev/pr-meta_x-road_service_metadata_protocol.md