From: Peter Amstutz <peter.amstutz@curoverse.com>
Date: Wed, 4 Jun 2014 19:23:31 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/master' into 2882-job-process-stats
X-Git-Tag: 1.1.0~2580^2~1
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/bf7687829f5222375441cf75c7d82d82a4f508c4

Merge remote-tracking branch 'origin/master' into 2882-job-process-stats
---

bf7687829f5222375441cf75c7d82d82a4f508c4
diff --cc services/api/app/models/job.rb
index dc3539891f,7bca409d0b..51fb7c2783
--- a/services/api/app/models/job.rb
+++ b/services/api/app/models/job.rb
@@@ -35,11 -35,8 +35,9 @@@ class Job < ArvadosMode
      t.add :runtime_constraints
      t.add :tasks_summary
      t.add :dependencies
-     t.add :log_stream_href
-     t.add :log_buffer
      t.add :nondeterministic
      t.add :repository
 +    t.add :supplied_script_version
    end
  
    def assert_finished