From: radhika <radhika@curoverse.com>
Date: Fri, 30 May 2014 21:39:44 +0000 (-0400)
Subject: Merge branch 'master' into 2903-remove-pi-active-and-success
X-Git-Tag: 1.1.0~2583^2~3
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/a6c0e01403377311a12f6d9ae587d92dbc00e1fd

Merge branch 'master' into 2903-remove-pi-active-and-success
---

a6c0e01403377311a12f6d9ae587d92dbc00e1fd
diff --cc services/api/app/controllers/arvados/v1/pipeline_instances_controller.rb
index 614af685f9,9781caf7e8..67090e68f2
--- a/services/api/app/controllers/arvados/v1/pipeline_instances_controller.rb
+++ b/services/api/app/controllers/arvados/v1/pipeline_instances_controller.rb
@@@ -1,5 -1,5 +1,6 @@@
  class Arvados::V1::PipelineInstancesController < ApplicationController
+   accept_attribute_as_json :components_summary, Hash
    accept_attribute_as_json :components, Hash
    accept_attribute_as_json :properties, Hash
 +  accept_attribute_as_json :components_summary, Hash
  end