[ARVADOS] updated: 1.1.4-385-g23d57ba45

[Git user]

Summary of changes:
 cmd/arvados-server/arvados-controller.service | 1 +
 1 file changed, 1 insertion(+)

       via  23d57ba45b348b580fc584bbd77fe3960796622d (commit)
      from  f777c74882e6b0f52b15f62d1d6251cd180979e4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 23d57ba45b348b580fc584bbd77fe3960796622d
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Fri Jun 15 15:41:51 2018 -0400

    13497: Load env vars from /etc/arvados/environment in controller.
    
    Facilitates setting node profile via ARVADOS_NODE_PROFILE environment
    var without editing the systemd unit file.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

diff --git a/cmd/arvados-server/arvados-controller.service b/cmd/arvados-server/arvados-controller.service
index fbd73e334..e85707473 100644
--- a/cmd/arvados-server/arvados-controller.service
+++ b/cmd/arvados-server/arvados-controller.service
@@ -16,6 +16,7 @@ StartLimitIntervalSec=0
 
 [Service]
 Type=notify
+EnvironmentFile=-/etc/arvados/environment
 ExecStart=/usr/bin/arvados-controller
 Restart=always
 RestartSec=1

-----------------------------------------------------------------------


hooks/post-receive
--