projects / arvados.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4d7567b e86ee86)
Merge branch '14714-keep-balance-config'
authorEric Biagiotti <ebiagiotti@veritasgenetics.com>
Thu, 3 Oct 2019 15:09:39 +0000 (11:09 -0400)
committerEric Biagiotti <ebiagiotti@veritasgenetics.com>
Thu, 3 Oct 2019 15:09:39 +0000 (11:09 -0400)
refs #14714

Arvados-DCO-1.1-Signed-off-by: Eric Biagiotti <ebiagiotti@veritasgenetics.com>

1  2 
lib/config/config.default.yml patch | diff1 | diff2 | blob | history
lib/config/generated_config.go patch | diff1 | diff2 | blob | history

diff --cc lib/config/config.default.yml
Simple merge
diff --cc lib/config/generated_config.go
Simple merge