Merge branch 'master' into bug5955

configuration/crontabs/crontab-docker-registry-gc

@@ -1 +1 @@
-0 7 2 * *       export PATH=/bin:/usr/bin:/usr/local/bin; docker exec -it registry-registry-1 registry garbage-collect /etc/docker/registry/config.yml
+0 7 2 * *       export PATH=/bin:/usr/bin:/usr/local/bin; docker exec -it registry-registry-1 registry garbage-collect /etc/docker/registry/config.yml

configuration/crontabs/crontab-switchoverArchive

@@ -1 +1 @@
-* * * * *	export PATH=/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin; sleep $(( $RANDOM * 60 / 32768 )); switchoverArchive.sh /etc/httpd/conf.d/000-macros.conf 2 9 
+* * * * * export PATH=/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin; sleep $(( $RANDOM * 60 / 32768 )); switchoverArchive.sh /etc/httpd/conf.d/000-macros.conf 2 9

configuration/crontabs/crontab-syncgit

@@ -1 +1 @@
-*/10 * * * * export PATH=/bin:/usr/bin:/usr/local/bin; syncgit PATH_OF_GIT_HOME_DIR_TO_REPLACE 
+*/10 * * * * export PATH=/bin:/usr/bin:/usr/local/bin; syncgit PATH_OF_GIT_HOME_DIR_TO_REPLACE

configuration/crontabs/crontab-update-authorized-keys

@@ -1 +1 @@
-* * * * *       export PATH=/bin:/usr/bin:/usr/local/bin; sleep $(( $RANDOM * 60 / 32768 )); update_authorized_keys_for_landscape_managers_if_changed $( cat PATH_OF_HOME_DIR_TO_REPLACE/ssh-key-reader.token ) https://security-service.sapsailing.com PATH_OF_HOME_DIR_TO_REPLACE  #2>&1 >>/var/log/sailing.err
+* * * * *       export PATH=/bin:/usr/bin:/usr/local/bin; sleep $(( $RANDOM * 60 / 32768 )); update_authorized_keys_for_landscape_managers_if_changed $( cat PATH_OF_HOME_DIR_TO_REPLACE/ssh-key-reader.token ) https://security-service.sapsailing.com PATH_OF_HOME_DIR_TO_REPLACE  # 2>&1 >>/var/log/sailing.err

configuration/crontabs/crontab-update-authorized-keys-ec2-user

@@ -0,0 +1 @@
+* * * * *       export PATH=/bin:/usr/bin:/usr/local/bin; sleep $(( $RANDOM * 60 / 32768 )); update_authorized_keys_for_landscape_managers_if_changed $( cat PATH_OF_HOME_DIR_TO_REPLACE/ssh-key-reader.token ) https://security-service.sapsailing.com /home/ec2-user  # 2>&1 >>/var/log/sailing.err

configuration/environments_scripts/build-crontab

@@ -39,11 +39,11 @@ if [[ -d "users" ]]; then
         HOME_DIR=$(eval echo $(printf "~%q" "$USERNAME"))   # The path to the home dir of the user whose cronjob will be installed.
         > $HOME_DIR/crontab
         for crontab in $(ls ${USERNAME}/crontab*); do
-            cat "$crontab"  >> $HOME_DIR/crontab
-            echo "" >> $HOME_DIR/crontab  # Adds a newline
+	    cat "${crontab}">> $HOME_DIR/crontab
         done
         sed -i "s|PATH_OF_GIT_HOME_DIR_TO_REPLACE|${GIT_PATH}|g" $HOME_DIR/crontab # Sets correct path to the git repo within the crontab.
         sed -i "s|PATH_OF_HOME_DIR_TO_REPLACE|${HOME_DIR}|g" $HOME_DIR/crontab # Sets the correct path to the home dir of the user whose crontab will be installed.
+        echo "">>$HOME_DIR/crontab  # Adds a newline
         if [[ "$INSTALL_CRONTAB" == "true" ]]; then    
             crontab -u ${USERNAME} $HOME_DIR/crontab # Install the crontab in the given user's home dir.
         fi

configuration/environments_scripts/mongo_instance_setup/users/root/crontab-update-authorized-keys-ec2-user

@@ -0,0 +1 @@
+../../../../crontabs/crontab-update-authorized-keys-ec2-user

configuration/environments_scripts/sailing_server/files/etc/systemd/system/sailing.service

@@ -1,6 +1,6 @@
 [Unit]
 Description=The sailing start-up service reading through EC2 userdata and acting accordingly
-Requires=-.mount mongod.service
+Requires=-.mount
 After=-.mount mongod.service
 
 [Install]

java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/RaceWindJsonSerializer.java

@@ -41,8 +41,7 @@ public class RaceWindJsonSerializer extends AbstractTrackedRaceDataJsonSerialize
         final TimePoint finalTo = Util.getEarliestOfTimePoints(trackedRace.getEndOfTracking(), trackedRace.getEndOfRace());
         final Set<WindSource> windSourcesToExclude = trackedRace.getWindSourcesToExclude();
         List<WindSource> highQualityWindSources = trackedRace.getWindSources().stream()
-                .filter(windSource -> (windSource.getType() == WindSourceType.EXPEDITION
-                        || windSource.getType() == WindSourceType.RACECOMMITTEE)
+                .filter(windSource -> windSource.getType() == WindSourceType.EXPEDITION
                         && !windSourcesToExclude.contains(windSource))
                 .collect(Collectors.toList());
         JSONArray windSourcesJson = new JSONArray();

java/com.sap.sailing.windestimation/src/com/sap/sailing/windestimation/model/regressor/twdtransition/DistanceBasedTwdTransitionRegressorModelContext.java

@@ -47,7 +47,7 @@ public final class DistanceBasedTwdTransitionRegressorModelContext
      *
      */
     public enum DistanceValueRange {
-        BEGINNING(0, 10, 1, false), MIDDLE1(10, 912, 1, true), MIDDLE2(912, 1368, 1, true), REMAINDER(1368,
+        BEGINNING(0, 10, 1, false), MIDDLE1(10, 100, 1, true), MIDDLE2(100, 500, 1, true), REMAINDER(500,
                 SupportedDimensionValueRange.MAX_VALUE, 1, true);
 
         private final SupportedDimensionValueRange supportedDimensionValueRange;