Merge branch 'master' into 2903-remove-pi-active-and-success
authorradhika <radhika@curoverse.com>
Mon, 2 Jun 2014 17:51:03 +0000 (13:51 -0400)
committerradhika <radhika@curoverse.com>
Mon, 2 Jun 2014 17:51:03 +0000 (13:51 -0400)
commit16263c93ec077d2d54b012b9916cc9a421888317
tree01d444e1c2cdba94050c282363c951ee4a67f235
parent95709eedf2452d3ceddeeb02d24b823a552300cf
parentc950192e08bcfc6e84432359a7128b73b52e8a58
Merge branch 'master' into 2903-remove-pi-active-and-success

Conflicts:
services/api/db/schema.rb
services/api/app/models/pipeline_instance.rb
services/api/db/schema.rb