Tom Clegg [Mon, 24 Nov 2014 15:51:01 +0000 (10:51 -0500)]
4651: Merge branch 'master' into 4651-boolean-params
Tom Clegg [Mon, 24 Nov 2014 15:44:53 +0000 (10:44 -0500)]
4651: Update NodesController _ping_requires_parameters format.
Tom Clegg [Mon, 24 Nov 2014 15:23:31 +0000 (10:23 -0500)]
4651: Fix KeepDisksController test failures.
Ward Vandewege [Mon, 24 Nov 2014 01:47:33 +0000 (20:47 -0500)]
Merge branch '4186-install-doc-improvements'
refs #4186
Ward Vandewege [Mon, 24 Nov 2014 01:46:49 +0000 (20:46 -0500)]
Improve the installation instructions for keepproxy and keepstore - take sudo into account.
refs #4186
Ward Vandewege [Sat, 22 Nov 2014 22:06:44 +0000 (17:06 -0500)]
Merge branch '4336-improve-upload-data-to-keep-doc'
refs #4336
Ward Vandewege [Sat, 22 Nov 2014 22:04:27 +0000 (17:04 -0500)]
Refactor the 'Uploading data' page.
refs #4336
Ward Vandewege [Sat, 22 Nov 2014 22:03:57 +0000 (17:03 -0500)]
Add basic documentation for arv keep put and arv keep get.
refs #4336
Ward Vandewege [Sat, 22 Nov 2014 22:03:08 +0000 (17:03 -0500)]
Link directly to the CLI SDK install instructions.
refs #4336
Ward Vandewege [Sat, 22 Nov 2014 21:57:43 +0000 (16:57 -0500)]
Make the 'check-environment' blurb stand out more from the regular text.
refs #4336
Ward Vandewege [Sat, 22 Nov 2014 20:17:57 +0000 (15:17 -0500)]
Wording improvements on the sdk cli installation page.
refs #4336
Ward Vandewege [Sat, 22 Nov 2014 20:12:43 +0000 (15:12 -0500)]
Fix typo.
refs #4336
Ward Vandewege [Sat, 22 Nov 2014 20:08:22 +0000 (15:08 -0500)]
Add third installation option for the python SDK: our debian/ubuntu packages.
refs #4336
Tom Clegg [Sat, 22 Nov 2014 00:09:43 +0000 (19:09 -0500)]
4651: Accept "false" as false for a boolean param. Reject bogus strings.
Also, advertise find_or_create param from the controller, not just the
discovery document generator.
radhika [Fri, 21 Nov 2014 21:57:51 +0000 (16:57 -0500)]
closes #4339
Merge branch '4339-test-error-while-loading-tab'
radhika [Fri, 21 Nov 2014 21:42:05 +0000 (16:42 -0500)]
4339: config will be reset after each test, so no need to reset it explicitly. also, use assert_selector instead of assert has_link?
radhika [Fri, 21 Nov 2014 21:06:44 +0000 (16:06 -0500)]
4339: add test for "error while loading tab"
radhika [Fri, 21 Nov 2014 20:03:05 +0000 (15:03 -0500)]
refs #4156
Merge branch '4156-cli-tests'
radhika [Fri, 21 Nov 2014 19:50:58 +0000 (14:50 -0500)]
Merge branch 'master' into 4156-cli-tests
radhika [Fri, 21 Nov 2014 19:50:25 +0000 (14:50 -0500)]
4156: uncomment one of the asserts
radhika [Fri, 21 Nov 2014 19:21:14 +0000 (14:21 -0500)]
closes #4641
Merge branch '4641-make-jenkins-tests-pass'
radhika [Fri, 21 Nov 2014 18:20:33 +0000 (13:20 -0500)]
4641: click on confirm dialog OK button in sharing test on Revoke action.
radhika [Fri, 21 Nov 2014 16:32:55 +0000 (11:32 -0500)]
4641: use selenium driver and bigger page width.
radhika [Fri, 21 Nov 2014 13:52:15 +0000 (08:52 -0500)]
Merge branch 'master' into 4156-cli-tests
radhika [Fri, 21 Nov 2014 13:51:37 +0000 (08:51 -0500)]
4156: 3 more tests needed to be skipped.
Tom Clegg [Thu, 20 Nov 2014 21:56:05 +0000 (16:56 -0500)]
Merge branch '4400-python-install-herring' refs #4400
Tim Pierce [Thu, 20 Nov 2014 21:39:33 +0000 (16:39 -0500)]
Merge branch '4595-document-arv-filters'
Refs #4595.
Ward Vandewege [Thu, 20 Nov 2014 21:35:04 +0000 (16:35 -0500)]
Reorganize the arv documentation a bit more, putting it all in one place.
refs #4595
Tom Clegg [Thu, 20 Nov 2014 21:33:49 +0000 (16:33 -0500)]
4400: Fix whitespace. Fix tagging in nodemanager, too.
Ward Vandewege [Thu, 20 Nov 2014 20:47:45 +0000 (15:47 -0500)]
Remove spurious empty line
refs #4595
Tim Pierce [Thu, 20 Nov 2014 20:38:14 +0000 (15:38 -0500)]
4595: add documentation for list --filters
radhika [Thu, 20 Nov 2014 19:08:56 +0000 (14:08 -0500)]
Merge branch 'master' into 4156-cli-tests
radhika [Thu, 20 Nov 2014 18:57:58 +0000 (13:57 -0500)]
closes #4592
Merge branch '4592-input-selection'
radhika [Thu, 20 Nov 2014 18:48:44 +0000 (13:48 -0500)]
4592: update fixture checksum
radhika [Thu, 20 Nov 2014 18:27:55 +0000 (13:27 -0500)]
4156: skip all the tests that require api server until #4534 is completed.
radhika [Thu, 20 Nov 2014 17:36:07 +0000 (12:36 -0500)]
Merge branch 'master' into 4156-cli-tests
radhika [Thu, 20 Nov 2014 17:29:54 +0000 (12:29 -0500)]
4592: add fixture to be used by the api server test "search collections with 'any' operator".
Tom Clegg [Thu, 20 Nov 2014 17:04:48 +0000 (12:04 -0500)]
Fix wrong variable assigned. refs #3824
Tom Clegg [Thu, 20 Nov 2014 17:02:57 +0000 (12:02 -0500)]
Fix syntax error in whitespace. refs #3824
radhika [Thu, 20 Nov 2014 16:59:29 +0000 (11:59 -0500)]
Merge branch 'master' into 4592-input-selection
radhika [Thu, 20 Nov 2014 16:46:41 +0000 (11:46 -0500)]
Merge branch 'master' into 4592-input-selection
Brett Smith [Thu, 20 Nov 2014 16:25:21 +0000 (11:25 -0500)]
Merge branch '4027-api-sdk-requires-docker-wip'
Refs #4027. Closes #4626, #4629.
Brett Smith [Thu, 20 Nov 2014 14:52:53 +0000 (09:52 -0500)]
4027: API Jobs that specify SDK version must also use Docker.
Because compute nodes will be upgraded regularly, we don't want to
guarantee that we'll have the necessary tools to run older SDK
versions. The primary motivation for this feature is to install SDKs
into Docker images, so we require that to be specified.
This commit removes a few `job.valid?` assertions from the job unit
tests. These are redundant when they come after `Job.create!` because
that will raise an exception if the job isn't valid.
radhika [Thu, 20 Nov 2014 16:23:09 +0000 (11:23 -0500)]
Merge branch 'master' into 4592-input-selection
radhika [Thu, 20 Nov 2014 16:20:50 +0000 (11:20 -0500)]
Merge branch 'master' into 4156-cli-tests
Tom Clegg [Thu, 20 Nov 2014 15:59:47 +0000 (10:59 -0500)]
4400: Do not add ".commitdate.hash" tag if a build tag is already set.
Tom Clegg [Thu, 20 Nov 2014 15:41:00 +0000 (10:41 -0500)]
Merge branch '3824-docker-fixes' refs #3824 refs #4186
Tom Clegg [Thu, 20 Nov 2014 15:38:27 +0000 (10:38 -0500)]
3824: Merge branch 'master' into 3824-docker-fixes
Ward Vandewege [Thu, 20 Nov 2014 15:32:24 +0000 (10:32 -0500)]
A few wording tweaks.
refs #3824
radhika [Thu, 20 Nov 2014 05:20:49 +0000 (00:20 -0500)]
4592: add test where a collection with no name is selected as input to a pipeline instance.
radhika [Thu, 20 Nov 2014 02:05:16 +0000 (21:05 -0500)]
4592: Fix the nil error when a collection without a name is selected as input.
Also refactor the pipeline instances integration test to break re-run instance test into its own test.
radhika [Wed, 19 Nov 2014 19:24:53 +0000 (14:24 -0500)]
Merge branch 'master' into 4156-cli-tests
radhika [Wed, 19 Nov 2014 19:23:11 +0000 (14:23 -0500)]
4156: skip arv-tag tests while arv-tag is being worked on.
Phil Hodgson [Wed, 19 Nov 2014 19:15:34 +0000 (20:15 +0100)]
Merge branch '3382-always-show-inputs' (closes #3382)
Phil Hodgson [Wed, 19 Nov 2014 18:50:19 +0000 (19:50 +0100)]
Merge branch 'master' into 3382-always-show-inputs
radhika [Wed, 19 Nov 2014 16:25:04 +0000 (11:25 -0500)]
Merge branch 'master' into 4156-cli-tests
radhika [Wed, 19 Nov 2014 16:19:27 +0000 (11:19 -0500)]
closes #4250
Merge branch '4250-doc-updates'
radhika [Wed, 19 Nov 2014 14:00:05 +0000 (09:00 -0500)]
4250: keep doc update
Phil Hodgson [Wed, 19 Nov 2014 09:15:45 +0000 (10:15 +0100)]
3382: test that after editing that an input is editable a second time
- reverted from commit
7bd04ed26901e34e3e5788093bee12be4406dd7b and then adjusted according to latest code review
radhika [Tue, 18 Nov 2014 22:43:35 +0000 (17:43 -0500)]
4156: little cleanup
radhika [Tue, 18 Nov 2014 22:28:55 +0000 (17:28 -0500)]
Merge branch 'master' into 4250-doc-updates
radhika [Tue, 18 Nov 2014 22:28:38 +0000 (17:28 -0500)]
Merge branch 'master' into 4156-cli-tests
radhika [Tue, 18 Nov 2014 22:27:49 +0000 (17:27 -0500)]
4156: update tests to match current impl
radhika [Tue, 18 Nov 2014 21:38:07 +0000 (16:38 -0500)]
4156: minor updates
Brett Smith [Tue, 18 Nov 2014 20:04:13 +0000 (15:04 -0500)]
Merge branch '4380-node-manager-slurm-drain-wip'
Closes #4380, #4519.
Brett Smith [Thu, 13 Nov 2014 20:34:54 +0000 (15:34 -0500)]
4380: Add SLURM dispatcher to Node Manager.
Brett Smith [Thu, 13 Nov 2014 20:44:19 +0000 (15:44 -0500)]
4380: Fix retry scheduling for Node Manager change methods.
Brett Smith [Thu, 13 Nov 2014 17:58:14 +0000 (12:58 -0500)]
4380: Node Manager shutdown actor is more robust.
ComputeNodeShutdownActor now checks that destroying the cloud node
succeeds. Before retrying, it will check if the node is still
eligible for shutdown, and abort if not.
Brett Smith [Thu, 13 Nov 2014 14:47:07 +0000 (09:47 -0500)]
4380: Node Manager monitors respond to shutdown_eligible message.
radhika [Tue, 18 Nov 2014 19:49:07 +0000 (14:49 -0500)]
4156: update test to expect uuid instead of pdh
radhika [Tue, 18 Nov 2014 19:34:57 +0000 (14:34 -0500)]
4250: update pdh to uuid in keep tutorial
radhika [Tue, 18 Nov 2014 19:16:54 +0000 (14:16 -0500)]
Merge branch 'master' into 4250-doc-updates
radhika [Tue, 18 Nov 2014 19:14:44 +0000 (14:14 -0500)]
Merge branch 'master' into 4156-cli-tests
radhika [Tue, 18 Nov 2014 19:14:06 +0000 (14:14 -0500)]
refs #4194
Merge branch '4194-keep-logging'
Tom Clegg [Tue, 18 Nov 2014 19:16:09 +0000 (14:16 -0500)]
Merge branch '4552-collection-unique-name' closes #4552
Conflicts:
services/api/app/models/collection.rb
radhika [Tue, 18 Nov 2014 19:13:08 +0000 (14:13 -0500)]
Merge branch 'master' into 4194-keep-logging
radhika [Tue, 18 Nov 2014 19:05:22 +0000 (14:05 -0500)]
4156: update failing tests in test_arv-put that were expecting pdh instead of uuid.
radhika [Tue, 18 Nov 2014 18:53:15 +0000 (13:53 -0500)]
Merge branch 'master' into 4194-keep-logging
radhika [Tue, 18 Nov 2014 18:49:31 +0000 (13:49 -0500)]
4194: use same log statement for successes as well as errors.
Tom Clegg [Tue, 18 Nov 2014 18:40:32 +0000 (13:40 -0500)]
4552: Set permit_unsigned_manifests=false needed for test.
Tom Clegg [Tue, 18 Nov 2014 18:31:11 +0000 (13:31 -0500)]
Merge branch '4363-less-filename-munging' closes #4363
Tom Clegg [Tue, 18 Nov 2014 17:39:50 +0000 (12:39 -0500)]
4363: Fix flaky test case (race with filterable.js debounce timer).
radhika [Tue, 18 Nov 2014 17:37:22 +0000 (12:37 -0500)]
4194: use go fmt to replace spaces with tabs.
radhika [Tue, 18 Nov 2014 17:29:33 +0000 (12:29 -0500)]
4194: just print data size and never the data
Tom Clegg [Tue, 18 Nov 2014 16:33:15 +0000 (11:33 -0500)]
4363: Fix size hints for multi-byte manifests (backported from
f78caf9).
Tom Clegg [Tue, 18 Nov 2014 16:24:58 +0000 (11:24 -0500)]
4363: Accept manifest_text in a non-UTF-8 encoding that is equal to its UTF-8 encoding.
Tom Clegg [Tue, 18 Nov 2014 15:58:19 +0000 (10:58 -0500)]
4363: Specify ASCII encoding in test case.
radhika [Tue, 18 Nov 2014 15:11:23 +0000 (10:11 -0500)]
closes #4194
Merge branch '4194-keep-logging'
radhika [Tue, 18 Nov 2014 15:08:14 +0000 (10:08 -0500)]
Merge branch 'master' into 4194-keep-logging
Brett Smith [Tue, 18 Nov 2014 14:21:24 +0000 (09:21 -0500)]
Merge branch '4027-sdk-constraint-reuse-wip'
Refs #4027. Closes #4532.
Brett Smith [Mon, 17 Nov 2014 22:31:12 +0000 (17:31 -0500)]
4027: Test updating job's SDK version after it's already set.
Brett Smith [Fri, 14 Nov 2014 18:57:33 +0000 (13:57 -0500)]
4027: API server considers arvados_sdk_version for Job reuse.
* Extend "in git" and "not in git" filters to the arvados_sdk_version
column.
* When no filters are specified, if the submitted job specifies an
arvados_sdk_version constraint, require reuse candidates to meet it.
* Document all this.
Tom Clegg [Tue, 18 Nov 2014 08:32:11 +0000 (03:32 -0500)]
4363: Merge branch 'master' into 4363-less-filename-munging
Tom Clegg [Tue, 18 Nov 2014 08:31:19 +0000 (03:31 -0500)]
4363: Explicit UTF-8 for test string.
Tom Clegg [Mon, 17 Nov 2014 16:01:49 +0000 (11:01 -0500)]
4363: Validate utf-8 encoding of manifest_text.
Tom Clegg [Thu, 13 Nov 2014 19:54:29 +0000 (14:54 -0500)]
4363: Remove redundant test.
Tom Clegg [Tue, 18 Nov 2014 07:36:58 +0000 (02:36 -0500)]
4400: Silence git error messages during package install (we ignore them anyway)
Tom Clegg [Mon, 17 Nov 2014 20:17:59 +0000 (15:17 -0500)]
4552: Tidy up ensure_unique_name block.
Tom Clegg [Mon, 17 Nov 2014 18:57:51 +0000 (13:57 -0500)]
4552: Use faster database_cleaner strategy.
Tom Clegg [Mon, 17 Nov 2014 18:48:30 +0000 (13:48 -0500)]
4552: Fix conflict between ensure_unique_name and signed manifests.