[ARVADOS] updated: eed7af8f901adb263c870a2277ec166467a28d77

[git at public.curoverse.com]

Summary of changes:
 sdk/cli/bin/crunch-job                       |    4 ++--
 services/api/app/models/pipeline_instance.rb |    6 +-----
 2 files changed, 3 insertions(+), 7 deletions(-)

       via  eed7af8f901adb263c870a2277ec166467a28d77 (commit)
       via  d97e3de81c48673b0e1d3927edaaf0e560a9a2ba (commit)
       via  14c312c452e0e010d617c02a33b94a178632ac26 (commit)
       via  5c3c04ad25cfabaa860bb0ea3f3dc078a9562008 (commit)
      from  5e968d7875c62a6145b7aefc39f070d14f4c97e8 (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 eed7af8f901adb263c870a2277ec166467a28d77
Merge: d97e3de 14c312c
Author: radhika <radhika at curoverse.com>
Date:   Thu May 8 10:45:00 2014 -0400

    Merge branch 'master' into 2352-use-state


commit d97e3de81c48673b0e1d3927edaaf0e560a9a2ba
Author: radhika <radhika at curoverse.com>
Date:   Thu May 8 10:40:53 2014 -0400

    2352: fix issue with setting active during save

diff --git a/services/api/app/models/pipeline_instance.rb b/services/api/app/models/pipeline_instance.rb
index 72191b1..5993f99 100644
--- a/services/api/app/models/pipeline_instance.rb
+++ b/services/api/app/models/pipeline_instance.rb
@@ -150,7 +150,7 @@ class PipelineInstance < ArvadosModel
         self.active = true
         self.success = nil
       when RunningOnClient
-        self.active = false
+        self.active = nil
         self.success = nil
       when Failed
         self.active = false
@@ -199,10 +199,6 @@ class PipelineInstance < ArvadosModel
         self.state = Ready
       end
     end
-
-    if self.state == Ready || self.state == New
-      self.active = nil
-    end 
   end
 
 end

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


hooks/post-receive
--