[ARVADOS] updated: eff3277fa6800bbc4ac81654f8883bbfd3a85d30
git at public.curoverse.com
git at public.curoverse.com
Wed May 7 19:54:46 EDT 2014
Summary of changes:
.gitignore | 2 +
apps/workbench/.gitignore | 3 +
apps/workbench/Gemfile | 5 +
apps/workbench/Gemfile.lock | 8 +
.../app/assets/javascripts/application.js | 1 -
apps/workbench/app/assets/javascripts/editable.js | 55 ++-
apps/workbench/app/assets/javascripts/folders.js | 12 +
..._authorizations.js.coffee => folders.js.coffee} | 0
apps/workbench/app/assets/javascripts/selection.js | 18 +-
.../app/assets/stylesheets/application.css.scss | 72 ++--
.../app/assets/stylesheets/cards.css.scss | 85 +++
.../{jobs.css.scss => folders.css.scss} | 2 +-
.../app/assets/stylesheets/sb-admin.css.scss | 164 ++++++
.../workbench/app/assets/stylesheets/selection.css | 22 +-
.../app/controllers/actions_controller.rb | 42 ++-
.../app/controllers/application_controller.rb | 47 ++-
.../app/controllers/collections_controller.rb | 1 -
.../app/controllers/folders_controller.rb | 99 ++++
.../workbench/app/controllers/groups_controller.rb | 7 +-
apps/workbench/app/helpers/application_helper.rb | 21 +-
apps/workbench/app/helpers/folders_helper.rb | 2 +
.../app/helpers/pipeline_instances_helper.rb | 1 -
apps/workbench/app/models/arvados_base.rb | 48 ++-
apps/workbench/app/models/arvados_resource_list.rb | 6 +
apps/workbench/app/models/collection.rb | 5 +
apps/workbench/app/models/group.rb | 10 +
apps/workbench/app/models/log.rb | 5 +
.../app/views/application/_content.html.erb | 2 +-
.../application/_delete_object_button.html.erb | 2 +-
.../views/application/_show_object_button.html.erb | 3 +
.../app/views/application/_show_recent.html.erb | 21 +-
.../workbench/app/views/application/index.html.erb | 6 +-
.../app/views/folders/_show_my_folders.html.erb | 2 +
.../views/folders/_show_shared_with_me.html.erb | 2 +
.../workbench/app/views/folders/remove_item.js.erb | 5 +
apps/workbench/app/views/folders/show.html.erb | 193 +++++++
.../app/views/layouts/application.html.erb | 321 ++++++-----
apps/workbench/app/views/logs/show.html.erb | 1 -
apps/workbench/config/routes.rb | 3 +
.../folders_controller_test.rb} | 2 +-
apps/workbench/test/integration/folders_test.rb | 48 ++
apps/workbench/test/integration/smoke_test.rb | 2 +-
apps/workbench/test/integration/users_test.rb | 51 +-
.../test/integration/virtual_machines_test.rb | 4 +-
apps/workbench/test/integration_helper.rb | 26 +
apps/workbench/test/test_helper.rb | 41 +-
.../test/unit/helpers/folders_helper_test.rb | 4 +
doc/_config.yml | 5 +-
doc/api/index.html.textile.liquid | 2 -
doc/api/methods.html.textile.liquid | 39 ++-
doc/api/methods/logs.html.textile.liquid | 22 +-
doc/api/schema/Collection.html.textile.liquid | 2 +-
doc/api/schema/Job.html.textile.liquid | 1 +
doc/install/index.html.md.liquid | 18 -
doc/install/index.html.textile.liquid | 18 +
doc/install/install-api-server.html.textile.liquid | 5 +-
.../install-crunch-dispatch.html.textile.liquid | 44 +-
doc/install/install-sso.html.textile.liquid | 3 +-
.../install-workbench-app.html.textile.liquid | 30 +-
doc/sdk/index.html.textile.liquid | 3 +-
doc/sdk/java/index.html.textile.liquid | 140 +++++
doc/sdk/perl/index.html.textile.liquid | 2 +-
doc/sdk/python/sdk-python.html.textile.liquid | 10 +-
doc/sdk/ruby/index.html.textile.liquid | 2 +-
docker/build_tools/Makefile | 10 +
docker/jobs/Dockerfile | 20 +
sdk/cli/bin/arv-run-pipeline-instance | 11 +-
sdk/cli/bin/crunch-job | 49 ++-
sdk/java/.classpath | 21 +
sdk/java/.project | 14 +
sdk/java/.settings/org.eclipse.jdt.core.prefs | 5 +
sdk/java/ArvadosSDKJavaExample.java | 80 +++
sdk/java/ArvadosSDKJavaExampleWithPrompt.java | 123 ++++
sdk/java/README | 4 +
sdk/java/pom.xml | 106 ++++
.../main/java/org/arvados/sdk/java/Arvados.java | 366 ++++++++++++
.../java/org/arvados/sdk/java/MethodDetails.java | 22 +
sdk/java/src/main/resources/log4j.properties | 11 +
.../java/org/arvados/sdk/java/ArvadosTest.java | 387 +++++++++++++
sdk/java/src/test/resources/first_pipeline.json | 16 +
sdk/python/.gitignore | 1 -
sdk/python/arvados/events.py | 33 ++
sdk/python/arvados/fuse.py | 317 -----------
sdk/python/arvados/fuse/__init__.py | 585 ++++++++++++++++++++
sdk/python/bin/arv-mount | 51 ++-
sdk/python/build.sh | 16 -
sdk/python/requirements.txt | 3 +
sdk/python/run_test_server.py | 86 +++
sdk/python/{setup.py.src => setup.py} | 9 +-
sdk/python/setup.py.src | 8 +-
sdk/python/setup_fuse.py | 21 +
sdk/python/setup_header.py | 11 +
sdk/python/test_mount.py | 246 +++++++--
sdk/python/test_websockets.py | 32 ++
sdk/ruby/.gitignore | 1 +
sdk/ruby/Gemfile.lock | 58 --
services/api/.gitignore | 2 +
services/api/Gemfile | 6 +-
services/api/Gemfile.lock | 10 +-
services/api/Rakefile | 6 +
.../api/app/controllers/application_controller.rb | 67 ---
.../controllers/arvados/v1/groups_controller.rb | 68 +++
.../controllers/arvados/v1/schema_controller.rb | 15 +-
.../app/controllers/user_sessions_controller.rb | 3 +-
services/api/app/models/arvados_model.rb | 20 +
services/api/app/models/group.rb | 1 +
services/api/app/models/pipeline_instance.rb | 4 +
services/api/app/models/user.rb | 4 +
services/api/lib/record_filters.rb | 13 +-
services/api/script/import_commits.rb | 9 -
services/api/test/fixtures/specimens.yml | 18 +
.../arvados/v1/groups_controller_test.rb | 37 ++
.../functional/arvados/v1/jobs_controller_test.rb | 34 ++
.../api/test/integration/user_sessions_test.rb | 28 +
services/api/test/test_helper.rb | 21 +
115 files changed, 3965 insertions(+), 952 deletions(-)
create mode 100644 apps/workbench/app/assets/javascripts/folders.js
copy apps/workbench/app/assets/javascripts/{api_client_authorizations.js.coffee => folders.js.coffee} (100%)
create mode 100644 apps/workbench/app/assets/stylesheets/cards.css.scss
copy apps/workbench/app/assets/stylesheets/{jobs.css.scss => folders.css.scss} (64%)
create mode 100644 apps/workbench/app/assets/stylesheets/sb-admin.css.scss
create mode 100644 apps/workbench/app/controllers/folders_controller.rb
create mode 100644 apps/workbench/app/helpers/folders_helper.rb
create mode 100644 apps/workbench/app/views/application/_show_object_button.html.erb
create mode 100644 apps/workbench/app/views/folders/_show_my_folders.html.erb
create mode 100644 apps/workbench/app/views/folders/_show_shared_with_me.html.erb
create mode 100644 apps/workbench/app/views/folders/remove_item.js.erb
create mode 100644 apps/workbench/app/views/folders/show.html.erb
delete mode 100644 apps/workbench/app/views/logs/show.html.erb
copy apps/workbench/test/{unit/job_test.rb => functional/folders_controller_test.rb} (57%)
create mode 100644 apps/workbench/test/integration/folders_test.rb
create mode 100644 apps/workbench/test/unit/helpers/folders_helper_test.rb
delete mode 100644 doc/install/index.html.md.liquid
create mode 100644 doc/install/index.html.textile.liquid
create mode 100644 doc/sdk/java/index.html.textile.liquid
create mode 100644 docker/jobs/Dockerfile
create mode 100644 sdk/java/.classpath
create mode 100644 sdk/java/.project
create mode 100644 sdk/java/.settings/org.eclipse.jdt.core.prefs
create mode 100644 sdk/java/ArvadosSDKJavaExample.java
create mode 100644 sdk/java/ArvadosSDKJavaExampleWithPrompt.java
create mode 100644 sdk/java/README
create mode 100644 sdk/java/pom.xml
create mode 100644 sdk/java/src/main/java/org/arvados/sdk/java/Arvados.java
create mode 100644 sdk/java/src/main/java/org/arvados/sdk/java/MethodDetails.java
create mode 100644 sdk/java/src/main/resources/log4j.properties
create mode 100644 sdk/java/src/test/java/org/arvados/sdk/java/ArvadosTest.java
create mode 100644 sdk/java/src/test/resources/first_pipeline.json
create mode 100644 sdk/python/arvados/events.py
delete mode 100644 sdk/python/arvados/fuse.py
create mode 100644 sdk/python/arvados/fuse/__init__.py
delete mode 100755 sdk/python/build.sh
create mode 100644 sdk/python/run_test_server.py
copy sdk/python/{setup.py.src => setup.py} (82%)
create mode 100644 sdk/python/setup_fuse.py
create mode 100644 sdk/python/setup_header.py
create mode 100644 sdk/python/test_websockets.py
delete mode 100644 sdk/ruby/Gemfile.lock
delete mode 100755 services/api/script/import_commits.rb
create mode 100644 services/api/test/integration/user_sessions_test.rb
via eff3277fa6800bbc4ac81654f8883bbfd3a85d30 (commit)
via 002f863605469cee7e112f4c16a78e3b6278672c (commit)
via 6c2a704b7a2d721087976b2b8ec4f22cdaf44178 (commit)
via cdf7b162906cb37d4ecf88ff6c72433bcdd8fc84 (commit)
via 722862465129f1f30cbb2432132140883d31b4ca (commit)
via 27fa0d391eb95008acf41ba207bc13b8c4fe794c (commit)
via f7f61eca36d66a723b02ac34db888f5fbdc63fc8 (commit)
via 2de827e57ae9ba1b0d322199d071ae900a5b7e0c (commit)
via d9aa5decc6edce30285df049277de2cf2c138c26 (commit)
via 222ce386e36b3d146e718a5d2f64a95fb30996bb (commit)
via 26d69329e87e343b84a132a4754068aca66ad132 (commit)
via 036a701b45399e0114eed5b0e1ce6b478c614534 (commit)
via b4516edf0a7cd1b584442953a8c965fc65104906 (commit)
via a3cd0039e84373541d6648b76647457be5a7e098 (commit)
via 8fcba3783d9a79bb18a00d339f9b3222f1eccd7f (commit)
via 1c6bc4bcac86195a120e6be564703e7d2133dbe7 (commit)
via 71143e41dbc8755d5ccb97990525bbb05aad69e9 (commit)
via 31c711afc4ff8a1728aeb3e5f405a131047671c9 (commit)
via 88590483c4d24904267b550cbb3af7d5a11d8953 (commit)
via 5b252752cdfd8b129d10913f7e2ec7b47f544ead (commit)
via 2376147b3d039acf08456a53015d59f04eabbf82 (commit)
via fde1e4f00e82c7a776892c1ab9c5edacf05dc1c3 (commit)
via 97252f1f34486073c778c0a1c9de25f2f275cacd (commit)
via ff6a6fb89b42d17693786be6405c267bee445c4d (commit)
via 45938e41f983ce41d8b55c3f980b7f31bc269124 (commit)
via f91c73aba940adf1e9fbd530d102931af45a63c5 (commit)
via 11b48e1b182cef419918d4df1a4998001d665a9a (commit)
via d70ff3d064c9a6da8b8678b249abf7f4b93b6370 (commit)
via 52a3016af3ff21b8fb5402bf70d0aab07f5ee486 (commit)
via 69141a18be1821daf4816046e65b2aea75a975be (commit)
via e65b2e685833e1d850c8d671fd1df9d4e4fea4a3 (commit)
via fdbea9e3c225a3184f8f7c2fac52abde643603c6 (commit)
via a04d67ef0823d6c87e8515cfe6cf88793ef5e3bb (commit)
via df2ce01533175ff7190a5d13fdca4b61f22befd3 (commit)
via f493dd4dfab89c228fab05e2b46851211c7fc586 (commit)
via ba764a7a0878b9cf0dd8d22ad4e12774d8e5f550 (commit)
via facf07110e28fe552342fbad623d621b43e22b99 (commit)
via 6f3853aef989e8c2243159bbf0ea352948ae4878 (commit)
via 67b4630e47e0f70e3cdbcaa8a7d039543e3c6a34 (commit)
via b2979b0db0b6b5ee7ad3001ffcc8f76ff4d96f05 (commit)
via 733269172b6b9802c2a00a8f8d19d6a520546a67 (commit)
via a2104e385abe47470dd42836a66360bf62afa57b (commit)
via 17b0eecaa5dd1e0ac006b6ba757f6aee251a139e (commit)
via f45ce8083a98e29720cfba01e8043f6465327c40 (commit)
via 7276cc563eb93589279f58b045f893a7c3b83835 (commit)
via fc4428224984cb71b961d17410205b535153c7f2 (commit)
via 385ce6601ff872a0a4124071ef39869a4d3cfd53 (commit)
via 32ca1dc4da9100a1a698d33a46c2919cf53fe606 (commit)
via a848b6ea430ee2b2c1daee80e846d4d3bd594920 (commit)
via 35fb8a1cd59d1dc0ad4be89c64e8b48c750faaeb (commit)
via 0ab985ff1da223e4065273fd1a549284ff3454ee (commit)
via e6aa5b48be1209d74c4c69be3eeca549f02418f3 (commit)
via 2e524eb008f8b70ca1263ccde460365109c66a90 (commit)
via 3ac9fd0c91fe202a59e7c3611156bb1a9b8118fe (commit)
via b5f193aa657134822d4df67cabc25c631926395b (commit)
via ff1e29f702d4f3036f5af014ad6e423b886ed0bb (commit)
via 66f1ae7a9be590461592199c6d3646dbc4eba786 (commit)
via 4bd14ccfa216fe1d115772508ac7d7c64ec59a48 (commit)
via 16c58b75712ad4332d55e490d20b3946d2e05008 (commit)
via 722e0c17507cc1fd21df7fafa43cc88965c092d8 (commit)
via 79f70f03efbfca59ea80b344e56aa29ac1e72c47 (commit)
via 1b1ddccffecf6e3d44aa2e1a632b54601ce282b6 (commit)
via aa0e6250280b5ac587b816f92127bae079d62dbc (commit)
via db1e389b74e37ecf4915168acdc72ea9ef624d9c (commit)
via 43bcfeaa2d9953ff03f34c65b95be9e386152362 (commit)
via cbf0429a8a5edd2f8a8d9b01ce39334e07e56bf8 (commit)
via 121fb6bdcdf3731903ce3d21c0a284c20e6a6fca (commit)
via 7871e324112f24527031f4100e4131ff2c6ab245 (commit)
via 6abcf1f6bdb82b176a9fbb48b6c7cefa64970a9d (commit)
via cbcb69fcbf73a1bde0ae78be8c0ad25f84c3f7c3 (commit)
via 611223d58fcdf5cc6ba434efed2c1ee9234b29a7 (commit)
via c6c3d3d23d1cca50381570d0558470d47e71fd95 (commit)
via 2b03b05de753509c026b4c67857cd49a11f44dcf (commit)
via c52a78b386adeebf33c618b669f33ca87c466eee (commit)
via 3e9576ef93a4d86882147b34ef9a28016375b865 (commit)
via ec56622b42f85aef2b4e8811378f8c99a6df24ea (commit)
via c6ad75e4241247ac18f5a5a8c397537dc6be1e3c (commit)
via 02b233b2eb80de1b234f3658d86a0e446e33a032 (commit)
via 428abec08e6ec59c38b7dc640396db950d42702b (commit)
via 6ada98b925a7b82a87446aacd0f6cca28df1b510 (commit)
via 11c6f1d759040f2af8a68d80ae78dd57a9b2d976 (commit)
via ccdaeb4b5b55c0e97e4fccc21445e5b9cc53dbe2 (commit)
via 17d83fff53eea039e1483f86efd4a66056fed647 (commit)
via 67fef1f4bec2d314c9d37bb05c55ff1067ba7b49 (commit)
via a998a520deb859216271567f1bf3623f310cf2d6 (commit)
via 51928265eaf8ca6b6319dd231d74604ceb3af287 (commit)
via 181fead894b660893e0e09274e609ec8ee4230a1 (commit)
via 51af13e97bc4725e8cc010c72bbedb667b0a0e0f (commit)
via e9359f96365d629a688cbbc2f7d063fabf535a9f (commit)
via 228f1ecbb98438fcd5bbe59465c830be637d38ce (commit)
via ee056b0ceb9ce569e0ee9a64b41ead728636772a (commit)
via 3e237c89424489bad02cde9be33f715269e0c6b8 (commit)
via 00ba956a67072f8b4a77fe71d3dc1e4dd8f70e98 (commit)
via 98fd371d846022d8ccc25e8234d913e436ecce69 (commit)
via 9c444153e80d3a872e11ca5898491c747a881a4d (commit)
via 0f7fa46c1311ddd2aa6e7f0c280b98a6d69d4ec8 (commit)
via 2e04dd8e9f872506922744dd449cccb99b55a847 (commit)
via 752bd0d292c7fd6eb55b39cdc9d7373c7f35e0ec (commit)
via 67c754c065dbe79e14a3c60640e6e604af32d0bd (commit)
via 77c4def0b319e3720dba05a3c1fb0ab78323f227 (commit)
via 65c155b7f691ce6a885125618bde3c9d68f6b47e (commit)
via d433ba0f548414219b3d976125e1ea530e1ba9ef (commit)
via d17ef1d036b4262f6c6c40324cc56d04d26581d3 (commit)
via c436da861845723ab18f56dba96052cf2569e539 (commit)
via 6a7ffd91ec95950588b95d3f29599d07d8447c16 (commit)
via f263c987ad0b144393edd28f281c5b19e84fdf0b (commit)
via 603bccd66ac868c2accf9dff9c3ca6b7feeed962 (commit)
via b8dc9c22c0a76b5ed8b36a42d06c45bd3069b6f5 (commit)
via a8fd97bee8b0d194a7013dffa0c8bfb8533e669b (commit)
via 1f763a5b1ad5c65a3265b4284958ecc0fe336f50 (commit)
via 20cbe1178d370b71e7df2650afa7d6dc7e8c73b8 (commit)
via 9143c3ec039d6c89512055f70c2fcc6e1065f1d7 (commit)
via 4b9281d9e47bf308d229ca4dde8af499a6674c9c (commit)
via a8918e636507200148758302dc6b9a081dc2f206 (commit)
via 7f3b351ccea1beee195c1176be229ffa6d104d3e (commit)
via c19ef999c3b938e6d3cdc3746fab5bad8aba3403 (commit)
via c8444a1f49cb77bc32f62135247f12301f4927d7 (commit)
via 70fa68ef9087dd85d6e18fba2ef11f94ddeb95a4 (commit)
via 4aee1d7246e344099fe7e10264d009e49aeafee0 (commit)
via d02c4efcfdbe8f21fba895749988b14b7db41310 (commit)
via ec824d69dee0696b1ca4748fbe5b912634940d53 (commit)
via 76b9eebf07b424ec2a8fde9b7760b8ce499063bc (commit)
via ac317fea1f11179b33eae7e06a60ba60df218f1c (commit)
via 568ea04cdde8988a675754372f618d937d3757e0 (commit)
via a74ae790b5a0682fa00423626103482c145e1b91 (commit)
via 66d12ae6dc72d45cc3cb3fcc007cb41371371616 (commit)
via fca1b2bd47910761f0c2603e72681670443e4be8 (commit)
via 4c19fb79d7b96bc18a1843182d3675c7a4de683d (commit)
via f23a72b89383c797663b5ec77d342bab20f239f4 (commit)
via 6177a6474c312d5d5b9c1f0eaa3ebd089a64b5f1 (commit)
via 9820178bf518d9ddace8c27ea383e5c37d86c8fe (commit)
via b7161fff2cb2fdd2bc0975c75f1fbc32f625343b (commit)
via 5d5c69bb5a60127aa509fac4bdfb8ea915eacadc (commit)
via 0e69f5346c474da7b2244546db4476f8ca21946f (commit)
via 3063c6106a83102214deb9d86ec621c0bb85d4b7 (commit)
via c623120453858c2ce47ab135f250c33a627a344d (commit)
via 20347d900fb2d75a3f3eef91d4da17a559b0ecd6 (commit)
via f107a5232d5e8788ae19daf1c5f6639f0c3cdb68 (commit)
via 7df1885cee1d6eb0f65a010f13ca7e9ff59c80d9 (commit)
via c66afecd36cf7d91223b5db79f3e120954f8217d (commit)
via 8ee3fe6685a716918a403f559c626c3b38e411f2 (commit)
via 2e273679fbf3f73ac7b7cfcf9ef8380047e959a0 (commit)
via ab5ded7cdf302ad156c58d47f59ab07e3a14ec69 (commit)
via abcde4a0bed9e80fc0925e70d151c7893043bc82 (commit)
via cc22cd28f536fa6fd95732372177d36a94a4c08d (commit)
via c13b9d5300b7f778e2fc05f9d043db4122d15aa1 (commit)
via d39470cbc160b9d51033a564e0b8867388a5a1d3 (commit)
via 1c45ed6a43b01a4f216cf8877b35d9ad18e1c5b5 (commit)
via c7fed8bfbd8a0e6edf83142b50bed4fe53c10c5c (commit)
via d28bf64e878b8d45e1ace6409e94027a039d3909 (commit)
via 72493a2fef971fc685ecef42c2b697338da69d2c (commit)
via 4d1481ed38e238e2e39d37775cb8cd86150bd04e (commit)
via c4fcddbe2a01ebbc3a4898dfa8744eb6fc45227e (commit)
via 84c471b1cfb20116b2d7d26215c2517cb57ba53f (commit)
via a5034fccf4a829a36d6e2670a9f62e4f7a545f2f (commit)
via 72c312b352a88740a44fba9e274d72bbabb489a7 (commit)
via ba4693cda66632d3da1a711b6910441958ecee01 (commit)
via 2e5fef753892523984f18c26fc16cfd599115f34 (commit)
via 420949e37a2903ab87f64f57278dfdc6a261a7f3 (commit)
via 2943d9c3622e2c5bca081dc48fd5d8d148dac386 (commit)
via bd240259a9d95a4da53eb0ff8a3644d7acd7705d (commit)
via e35fb48f1485a92a64a30efe8b1c43a179b70260 (commit)
via 7e8f99556391cc81c014b517a9fa6efed8fe8113 (commit)
via 2f3e496712802324e5d184f9ae59866df1772ef0 (commit)
via bf15373590e21dafd696fa0c10906eb653610d1d (commit)
via 8086f73aca674d7533e88bdd3850042553487d2b (commit)
via 8b77f66275fd87f70dd79075a71d8062311541bc (commit)
via 57dc9e64bb38f186e2b235a98d7437a5f986bc83 (commit)
via d7ccebe29c68df51633f6a18eba6aa6a982c3739 (commit)
from 01436e8b76300759ef4bfea30d7798445d50bf60 (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 eff3277fa6800bbc4ac81654f8883bbfd3a85d30
Author: radhika <radhika at curoverse.com>
Date: Wed May 7 19:54:23 2014 -0400
2352: set active to nil when Ready
diff --git a/sdk/cli/bin/arv-run-pipeline-instance b/sdk/cli/bin/arv-run-pipeline-instance
index f0ada5d..5f925ef 100755
--- a/sdk/cli/bin/arv-run-pipeline-instance
+++ b/sdk/cli/bin/arv-run-pipeline-instance
@@ -416,7 +416,8 @@ class WhRunPipelineInstance
if $options[:submit]
@instance ||= PipelineInstance.
create(:components => @components,
- :pipeline_template_uuid => @template[:uuid])
+ :pipeline_template_uuid => @template[:uuid],
+ :state => 'New')
else
@instance ||= PipelineInstance.
create(:components => @components,
diff --git a/services/api/app/models/pipeline_instance.rb b/services/api/app/models/pipeline_instance.rb
index 258ee27..32c284b 100644
--- a/services/api/app/models/pipeline_instance.rb
+++ b/services/api/app/models/pipeline_instance.rb
@@ -199,6 +199,10 @@ class PipelineInstance < ArvadosModel
self.state = Ready
end
end
+
+ if self.state == Ready || self.state == New
+ self.active = nil
+ end
end
end
commit 002f863605469cee7e112f4c16a78e3b6278672c
Author: radhika <radhika at curoverse.com>
Date: Wed May 7 19:34:24 2014 -0400
2352: when --submit is used, set the state to Ready, not RunningOnClient.
And do not set Active to true.
diff --git a/sdk/cli/bin/arv-run-pipeline-instance b/sdk/cli/bin/arv-run-pipeline-instance
index 60d5c38..f0ada5d 100755
--- a/sdk/cli/bin/arv-run-pipeline-instance
+++ b/sdk/cli/bin/arv-run-pipeline-instance
@@ -413,10 +413,16 @@ class WhRunPipelineInstance
end
def setup_instance
- @instance ||= PipelineInstance.
- create(:components => @components,
+ if $options[:submit]
+ @instance ||= PipelineInstance.
+ create(:components => @components,
+ :pipeline_template_uuid => @template[:uuid])
+ else
+ @instance ||= PipelineInstance.
+ create(:components => @components,
:pipeline_template_uuid => @template[:uuid],
:state => 'RunningOnClient')
+ end
self
end
commit 6c2a704b7a2d721087976b2b8ec4f22cdaf44178
Merge: 01436e8 cdf7b16
Author: radhika <radhika at curoverse.com>
Date: Wed May 7 15:04:40 2014 -0400
Merge branch 'master' into 2352-use-state
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list