Merge pull request #219 from stackhpc/upstream/yoga-2023-04-24

Synchronise yoga with upstream

Author: mnasiadka

docker/base/Dockerfile.j2

@@ -139,9 +139,9 @@ RUN rm -f /etc/rpm/macros.image-language-conf \
 {%- if not loop.last %} \{% endif %}
 {% endfor -%}
 
-{% for cmd in rpm_setup %}
+{% for cmd in rpm_setup %}
 {{ cmd }}
-{% endfor %}
+{% endfor %}
 
 {% block base_centos_repo_overrides_post_rpm %}{% endblock %}
 

specs/logging-with-heka.rst

@@ -256,7 +256,7 @@ An alternative to this proposal involves using Logstash in a centralized
 way as done in [1].
 
 Another alternative would be to execute Logstash on each cluster node, as this
-spec proposes with Heka. But this would mean running a JVM on each cluster
+spec proposes with Heka. But this would mean running a JVM on each cluster
 node, and using Redis as a centralized queue.
 
 Also, as described above, we initially considered relying on services writing