From: Peter Amstutz <peter.amstutz@curoverse.com>
Date: Mon, 1 May 2017 17:29:49 +0000 (-0400)
Subject: Merge branch 'master' into origin-8019-crunchrun-log-throttle
X-Git-Tag: 1.1.0~267^2~5
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/5d00ecb0932f86e4d2aced3d9258b96522ef38bd

Merge branch 'master' into origin-8019-crunchrun-log-throttle
---

5d00ecb0932f86e4d2aced3d9258b96522ef38bd
diff --cc services/api/app/controllers/arvados/v1/schema_controller.rb
index 07a581f4c2,11269d2556..e1f4ca5770
--- a/services/api/app/controllers/arvados/v1/schema_controller.rb
+++ b/services/api/app/controllers/arvados/v1/schema_controller.rb
@@@ -38,13 -38,7 +38,14 @@@ class Arvados::V1::SchemaController < A
          blobSignatureTtl: Rails.application.config.blob_signature_ttl,
          maxRequestSize: Rails.application.config.max_request_size,
          dockerImageFormats: Rails.application.config.docker_image_formats,
 +        crunchLogBytesPerEvent: Rails.application.config.crunch_log_bytes_per_event,
 +        crunchLogSecondsBetweenEvents: Rails.application.config.crunch_log_seconds_between_events,
 +        crunchLogThrottlePeriod: Rails.application.config.crunch_log_throttle_period,
 +        crunchLogThrottleBytes: Rails.application.config.crunch_log_throttle_bytes,
 +        crunchLogThrottleLines: Rails.application.config.crunch_log_throttle_lines,
 +        crunchLimitLogBytesPerJob: Rails.application.config.crunch_limit_log_bytes_per_job,
 +        crunchLogPartialLineThrottlePeriod: Rails.application.config.crunch_log_partial_line_throttle_period,
+         websocketUrl: Rails.application.config.websocket_address,
          parameters: {
            alt: {
              type: "string",