arvados.git
9 years agoCollections fixup: Add docstrings about num_retries. 3147-py-collection-retries-wip2
Brett Smith [Thu, 18 Sep 2014 19:29:17 +0000 (15:29 -0400)]
Collections fixup: Add docstrings about num_retries.

9 years agoarv-get fixup: Prevent race condition, better error reporting.
Brett Smith [Thu, 18 Sep 2014 19:10:37 +0000 (15:10 -0400)]
arv-get fixup: Prevent race condition, better error reporting.

9 years ago3147: crunch-job retries data uploads more for longer-running jobs.
Brett Smith [Mon, 15 Sep 2014 22:13:40 +0000 (18:13 -0400)]
3147: crunch-job retries data uploads more for longer-running jobs.

9 years ago3147: Add retry support to FUSE driver.
Brett Smith [Tue, 16 Sep 2014 21:29:38 +0000 (17:29 -0400)]
3147: Add retry support to FUSE driver.

9 years ago3147: FUSE driver requires a Python SDK with retry support.
Brett Smith [Mon, 15 Sep 2014 14:58:11 +0000 (10:58 -0400)]
3147: FUSE driver requires a Python SDK with retry support.

I also took out some of the older log-handling code while I was at it,
since the stricter versioning makes it unnecessary.

9 years ago3147: Add retry support to PySDK list_all utility.
Brett Smith [Mon, 15 Sep 2014 15:21:31 +0000 (11:21 -0400)]
3147: Add retry support to PySDK list_all utility.

9 years ago3147: Add retry support to Python CLI tools.
Brett Smith [Mon, 15 Sep 2014 14:37:32 +0000 (10:37 -0400)]
3147: Add retry support to Python CLI tools.

9 years ago3147: Add retry support to PySDK Collection objects.
Brett Smith [Tue, 16 Sep 2014 21:27:51 +0000 (17:27 -0400)]
3147: Add retry support to PySDK Collection objects.

This required updating the FUSE driver's SafeApi object to better
imitate a real API object, now that CollectionReader will pass it down
to the underlying KeepClient.

9 years ago3147: Add retry support to PySDK StreamReader classes.
Brett Smith [Fri, 12 Sep 2014 13:28:47 +0000 (09:28 -0400)]
3147: Add retry support to PySDK StreamReader classes.

9 years ago3147: Make PySDK KeepClient.get and put retry_methods.
Brett Smith [Tue, 16 Sep 2014 21:24:31 +0000 (17:24 -0400)]
3147: Make PySDK KeepClient.get and put retry_methods.

9 years ago3147: Add retry_method to the Python SDK.
Brett Smith [Fri, 12 Sep 2014 12:49:21 +0000 (08:49 -0400)]
3147: Add retry_method to the Python SDK.

This gives us a way to make retry support flexible and consistent
across SDK classes.  Any class that has retryable operations should
take a num_retries argument at initialization.  Then, the specific
methods that implement those operations should also take a num_retries
argument, which will fall back to the instance's setting by default.
This lets SDK users express their retry preferences wherever it's most
convenient for them.

9 years ago3147: Fix variable name typo.
Brett Smith [Thu, 11 Sep 2014 18:46:37 +0000 (14:46 -0400)]
3147: Fix variable name typo.

This variable was renamed in previous branch work, but this last user
of it wasn't caught until just now.

9 years ago3147: PySDK StreamReader instantiates a KeepClient late.
Brett Smith [Thu, 11 Sep 2014 18:22:12 +0000 (14:22 -0400)]
3147: PySDK StreamReader instantiates a KeepClient late.

Similarly with API client instantiation in KeepClient, this helps with
testing.  Refs #3693.

9 years ago3147: Move PySDK HTTP test infrastructure to testutil.
Brett Smith [Fri, 12 Sep 2014 20:46:54 +0000 (16:46 -0400)]
3147: Move PySDK HTTP test infrastructure to testutil.

Making this available to other test collections.

9 years ago3147: PySDK tests use mock>=1.0 and easier mock side_effect.
Brett Smith [Wed, 10 Sep 2014 20:44:25 +0000 (16:44 -0400)]
3147: PySDK tests use mock>=1.0 and easier mock side_effect.

9 years agono issue # remove pipeline instance fixture to address failing test.
radhika [Tue, 16 Sep 2014 21:27:33 +0000 (17:27 -0400)]
no issue # remove pipeline instance fixture to address failing test.
Merge branch '2875-pipeline-description'

9 years ago2875: remove pipeline instance fixture and use an existing one.
radhika [Tue, 16 Sep 2014 21:26:13 +0000 (17:26 -0400)]
2875: remove pipeline instance fixture and use an existing one.

9 years agoMerge branch '3877-log-memory-leak' closes #3877
Tom Clegg [Tue, 16 Sep 2014 21:04:10 +0000 (17:04 -0400)]
Merge branch '3877-log-memory-leak' closes #3877

9 years agoMake sure to run apt-get update before trying to install
Ward Vandewege [Tue, 16 Sep 2014 20:36:03 +0000 (16:36 -0400)]
Make sure to run apt-get update before trying to install
openjdk-7-jre-headless into the java-bwa-samtools arvados docker image.

no issue #

9 years agoMerge branch '3878-arv-mount-block-cache' closes #3878
Peter Amstutz [Tue, 16 Sep 2014 20:05:18 +0000 (16:05 -0400)]
Merge branch '3878-arv-mount-block-cache' closes #3878

9 years ago3878: Remove raise debugging exception.
Peter Amstutz [Tue, 16 Sep 2014 20:04:37 +0000 (16:04 -0400)]
3878: Remove raise debugging exception.

9 years ago3878: Fix block cache sharing across threads so arv-mount uses a bounded amount
Peter Amstutz [Tue, 16 Sep 2014 18:49:38 +0000 (14:49 -0400)]
3878: Fix block cache sharing across threads so arv-mount uses a bounded amount
of memory to store block.  Also fixes bug in cache management code and cleans
some exception handler error reporting.

9 years agocloses #2875
radhika [Tue, 16 Sep 2014 15:28:53 +0000 (11:28 -0400)]
closes #2875
Merge branch '2875-pipeline-description'

9 years ago2875: minor text update
radhika [Tue, 16 Sep 2014 15:27:30 +0000 (11:27 -0400)]
2875: minor text update

9 years ago2875: collection description is now textile and also the display is updated.
radhika [Tue, 16 Sep 2014 15:22:02 +0000 (11:22 -0400)]
2875: collection description is now textile and also the display is updated.

9 years ago2875: remove junk migration lines
radhika [Tue, 16 Sep 2014 14:54:53 +0000 (10:54 -0400)]
2875: remove junk migration lines

9 years ago3877: Fix memory leak after "log truncated" decision. Clean up code.
Tom Clegg [Tue, 16 Sep 2014 14:51:27 +0000 (10:51 -0400)]
3877: Fix memory leak after "log truncated" decision. Clean up code.

9 years agono issue # fix failing test to use selenium driver
radhika [Mon, 15 Sep 2014 15:27:45 +0000 (11:27 -0400)]
no issue # fix failing test to use selenium driver

9 years ago2875: integration tests to verify description on pipeline templates, instances, and...
radhika [Mon, 15 Sep 2014 14:54:10 +0000 (10:54 -0400)]
2875: integration tests to verify description on pipeline templates, instances, and jobs.

9 years agoUpdated Gemfile to pull in changes from commit:ac594f1 refs #3187
Peter Amstutz [Mon, 15 Sep 2014 13:46:54 +0000 (09:46 -0400)]
Updated Gemfile to pull in changes from commit:ac594f1 refs #3187

9 years ago2875: render template description as textile attribte in show recent page
radhika [Mon, 15 Sep 2014 12:18:37 +0000 (08:18 -0400)]
2875: render template description as textile attribte in show recent page

9 years ago2875: add description option
radhika [Mon, 15 Sep 2014 12:10:29 +0000 (08:10 -0400)]
2875: add description option

9 years ago2875: add initial description to pipeline instance when created using arv-run-pipelin...
radhika [Fri, 12 Sep 2014 22:15:21 +0000 (18:15 -0400)]
2875: add initial description to pipeline instance when created using arv-run-pipeline-instance script

9 years agoMerge branch 'master' into 2875-pipeline-description
radhika [Fri, 12 Sep 2014 20:49:57 +0000 (16:49 -0400)]
Merge branch 'master' into 2875-pipeline-description

9 years agocloses #3654
radhika [Fri, 12 Sep 2014 20:46:51 +0000 (16:46 -0400)]
closes #3654
Merge branch '3654-combine-selections'

9 years agoMerge branch 'master' into 3654-combine-selections
radhika [Fri, 12 Sep 2014 20:43:28 +0000 (16:43 -0400)]
Merge branch 'master' into 3654-combine-selections

9 years ago2875: initial description on pipeline instance when the template has no name.
radhika [Fri, 12 Sep 2014 20:41:48 +0000 (16:41 -0400)]
2875: initial description on pipeline instance when the template has no name.

9 years agoMerge branch 'master' into 2875-pipeline-description
radhika [Fri, 12 Sep 2014 19:48:45 +0000 (15:48 -0400)]
Merge branch 'master' into 2875-pipeline-description

9 years ago2875: set initial description on the new pipeline instance created by running a template.
radhika [Fri, 12 Sep 2014 19:46:05 +0000 (15:46 -0400)]
2875: set initial description on the new pipeline instance created by running a template.

9 years agoBug fix: manifests with extra spaces
Tim Pierce [Fri, 12 Sep 2014 19:18:15 +0000 (15:18 -0400)]
Bug fix: manifests with extra spaces

Extend the regular expression to match manifest_text to permit more than
a single space in manifest entries (seen in e.g. 91534558193f42a2f7f8aca872e5a78d+15723)

No issue #

9 years ago3654: disable search icon collection show page rather than hide it when it is not...
radhika [Fri, 12 Sep 2014 18:19:44 +0000 (14:19 -0400)]
3654: disable search icon collection show page rather than hide it when it is not applicable.

9 years agoMerge branch 'master' into 3654-combine-selections
radhika [Fri, 12 Sep 2014 17:26:37 +0000 (13:26 -0400)]
Merge branch 'master' into 3654-combine-selections

9 years agoMerge branch 'master' into 2875-pipeline-description
radhika [Fri, 12 Sep 2014 17:23:06 +0000 (13:23 -0400)]
Merge branch 'master' into 2875-pipeline-description

Conflicts:
services/api/app/models/pipeline_instance.rb
services/api/db/structure.sql

9 years ago2875: add new partial to display name and description.
radhika [Fri, 12 Sep 2014 17:17:14 +0000 (13:17 -0400)]
2875: add new partial to display name and description.

9 years agoMerge branch '3187-start-finish-timestamps-tasks-pipelines' refs #3187
Peter Amstutz [Fri, 12 Sep 2014 13:43:34 +0000 (09:43 -0400)]
Merge branch '3187-start-finish-timestamps-tasks-pipelines' refs #3187

9 years agoFixed typo Y% -> %Y
Peter Amstutz [Fri, 12 Sep 2014 13:39:09 +0000 (09:39 -0400)]
Fixed typo Y% -> %Y

9 years ago3654: update tests to match the selection dropdown text changes.
radhika [Thu, 11 Sep 2014 23:37:39 +0000 (19:37 -0400)]
3654: update tests to match the selection dropdown text changes.

9 years ago2875: add description to jobs and pipeline_instances.
radhika [Thu, 11 Sep 2014 23:20:04 +0000 (19:20 -0400)]
2875: add description to jobs and pipeline_instances.

9 years agoMerge branch 'master' into 3654-combine-selections
radhika [Thu, 11 Sep 2014 20:19:52 +0000 (16:19 -0400)]
Merge branch 'master' into 3654-combine-selections

9 years ago3654: move the checkbox to the left of the row in collection show page. also, fixed...
radhika [Thu, 11 Sep 2014 20:18:07 +0000 (16:18 -0400)]
3654: move the checkbox to the left of the row in collection show page. also, fixed a bug where the newly added selection dropdown shows up in the collection file chooser popup.

9 years ago3187: Update the task start time when the task actually starts.
Peter Amstutz [Thu, 11 Sep 2014 19:54:50 +0000 (15:54 -0400)]
3187: Update the task start time when the task actually starts.

9 years agoFallout from #3036: the test for the checkbox value on acceptance of the
Ward Vandewege [Thu, 11 Sep 2014 19:01:41 +0000 (15:01 -0400)]
Fallout from #3036: the test for the checkbox value on acceptance of the
user agreement was expecting a keep hash, rather than an Arvados UUID.

This fixes accepting the user agreement (if one or more are present).

refs #3036

9 years ago3654: add a default name to newly created combined collection
radhika [Thu, 11 Sep 2014 19:01:07 +0000 (15:01 -0400)]
3654: add a default name to newly created combined collection

9 years agoMerge branch 'master' into 3654-combine-selections
radhika [Thu, 11 Sep 2014 17:38:00 +0000 (13:38 -0400)]
Merge branch 'master' into 3654-combine-selections

9 years agoClean up manifest whitespace in split-fastq.
Brett Smith [Thu, 11 Sep 2014 15:21:36 +0000 (11:21 -0400)]
Clean up manifest whitespace in split-fastq.

The previous code was generating two spaces between the stream name
and block list, because it had the space from as_manifest() as well as
its own join.  This yielded an invalid manifest.

No issue #.

9 years agoMerge branch 'master' into 3187-start-finish-timestamps-tasks-pipelines
Peter Amstutz [Thu, 11 Sep 2014 13:02:14 +0000 (09:02 -0400)]
Merge branch 'master' into 3187-start-finish-timestamps-tasks-pipelines

9 years agoPrevent PySDK CollectionReader from sending UUIDs to Keep.
Brett Smith [Wed, 10 Sep 2014 21:00:21 +0000 (17:00 -0400)]
Prevent PySDK CollectionReader from sending UUIDs to Keep.

No issue #.  I tickled this while I was working on #3147.  Ward saw
the apparent symptom come up in a Job log, so I'm pushing the fix at
his request.  I have a test prepared in my branch, along with a bunch
of test infrastructure.

9 years ago3846: Improve timeout handling in PySDK KeepClient.
Brett Smith [Wed, 10 Sep 2014 18:22:01 +0000 (14:22 -0400)]
3846: Improve timeout handling in PySDK KeepClient.

* Catch socket errors (including timeouts) and treat them as
  transient with regard to retry logic.
* Increase the default timeout to 5 minutes.  Given how long it can
  take to PUT 64MiB to a proxy and wait for two servers to return
  success, this seems like a reasonable default.  Future improvements
  could set different timeouts based on the request type and whether
  or not we're talking to a proxy.

Closes #3846.

9 years ago3842: Keep::Manifest concatenates file information from manifest.
Brett Smith [Wed, 10 Sep 2014 16:39:58 +0000 (12:39 -0400)]
3842: Keep::Manifest concatenates file information from manifest.

The previous implementation failed to consider the possibility that
file information would be spread across multiple lines of a manifest.
This would cause, e.g., the same file to be yielded many times from
each_file.

This requirement makes it impossible to return file size information
without parsing the entire manifest.  Because of that, I have reworked
the Ruby SDK API so that method names are more consistent with their
performance characteristics.  I have also added some methods to do
some basic file existence checking that do not require parsing the
whole manifest.

Closes #3842.  Refs #3720.

9 years ago3187: Record started_at and finished_at for tasks and pipelines.
Peter Amstutz [Tue, 9 Sep 2014 19:39:55 +0000 (15:39 -0400)]
3187: Record started_at and finished_at for tasks and pipelines.

9 years agoMerge branch 'master' into 3654-combine-selections
radhika [Tue, 9 Sep 2014 19:17:43 +0000 (15:17 -0400)]
Merge branch 'master' into 3654-combine-selections

9 years ago3654: display show icon for files only when the file suffix is one of txt, gif etc...
radhika [Tue, 9 Sep 2014 19:16:23 +0000 (15:16 -0400)]
3654: display show icon for files only when the file suffix is one of txt, gif etc. Also, fixed a bug in summary html where the collection show was failing when finished_at is not available.

9 years ago#3830: Make crunch-job's git calls more robust.
Brett Smith [Tue, 9 Sep 2014 19:16:22 +0000 (15:16 -0400)]
#3830: Make crunch-job's git calls more robust.

* Check git's exit status and only continue on 0.
* Log git's exit status after optional calls.
* Always log the resolved commit hash when it's found.

Hopefully this will prevent a recurrence of refs #3830, or help rule
out some possibilities if it does happen.  Tested by hand on 4xphq.

9 years ago3187: Migration to add started_at and finished_at to job_tasks and pipeline_instances.
Peter Amstutz [Tue, 9 Sep 2014 18:43:29 +0000 (14:43 -0400)]
3187: Migration to add started_at and finished_at to job_tasks and pipeline_instances.

9 years agoMerge branch 'master' into 3654-combine-selections
radhika [Tue, 9 Sep 2014 17:25:12 +0000 (13:25 -0400)]
Merge branch 'master' into 3654-combine-selections

9 years agoMerge branch '3453-arv-list-docker-images' closes #3453, #3472, refs #3125
Peter Amstutz [Tue, 9 Sep 2014 15:58:12 +0000 (11:58 -0400)]
Merge branch '3453-arv-list-docker-images' closes #3453, #3472, refs #3125

9 years ago3453: Rename check_project_exists to desired_project_uuid. Now raises and
Peter Amstutz [Tue, 9 Sep 2014 15:53:48 +0000 (11:53 -0400)]
3453: Rename check_project_exists to desired_project_uuid.  Now raises and
catches distinct apiclient.errors.Error, ValueError errors for project not
found or invalid uuid.

9 years agoMerge branch '3586-job-priority' closes #3586
Peter Amstutz [Tue, 9 Sep 2014 13:25:27 +0000 (09:25 -0400)]
Merge branch '3586-job-priority' closes #3586

9 years agoMerge branch 'master' into 3586-job-priority closes #3586
Peter Amstutz [Mon, 8 Sep 2014 20:56:51 +0000 (16:56 -0400)]
Merge branch 'master' into 3586-job-priority closes #3586

9 years agoMerge branch '3644-arv-mount-projects' closes #3644
Peter Amstutz [Mon, 8 Sep 2014 20:55:47 +0000 (16:55 -0400)]
Merge branch '3644-arv-mount-projects' closes #3644

9 years ago3453: Refactored arv-put to remove support for name links, correctly use
Peter Amstutz [Mon, 8 Sep 2014 20:54:49 +0000 (16:54 -0400)]
3453: Refactored arv-put to remove support for name links, correctly use
ensure_name_unique to prevent name collisions.  arv-keepdocker should now
correctly handle cases where the user provides a image hash instead of
repository/tag. Fixed tests.

9 years ago3644: Update tests broken by merge
Peter Amstutz [Mon, 8 Sep 2014 19:54:35 +0000 (15:54 -0400)]
3644: Update tests broken by merge

9 years ago3823: bug fixes for arvados-bcbio-nextgen.py
Tim Pierce [Mon, 8 Sep 2014 19:47:54 +0000 (15:47 -0400)]
3823: bug fixes for arvados-bcbio-nextgen.py

Refs #3823

9 years ago3644: Moved some common regex patterns into SDK
Peter Amstutz [Mon, 8 Sep 2014 19:37:55 +0000 (15:37 -0400)]
3644: Moved some common regex patterns into SDK

9 years agoMerge branch 'master' into 3644-arv-mount-projects
Peter Amstutz [Mon, 8 Sep 2014 19:07:05 +0000 (15:07 -0400)]
Merge branch 'master' into 3644-arv-mount-projects

9 years ago3644: Restore 'tag' tests and add 'SharedDirectory' and 'HomeDirectory' tests.
Peter Amstutz [Mon, 8 Sep 2014 19:06:33 +0000 (15:06 -0400)]
3644: Restore 'tag' tests and add 'SharedDirectory' and 'HomeDirectory' tests.
All tests should pass now.

9 years agoMerge branch '3663-collection-reader-performance'
Tim Pierce [Mon, 8 Sep 2014 18:06:43 +0000 (14:06 -0400)]
Merge branch '3663-collection-reader-performance'

Closes #3663.

9 years agoMerge branch 'master' into 3654-combine-selections
radhika [Mon, 8 Sep 2014 14:56:51 +0000 (10:56 -0400)]
Merge branch 'master' into 3654-combine-selections

9 years ago3453: Add ensure_unique_name=True to collection create.
Peter Amstutz [Mon, 8 Sep 2014 14:56:19 +0000 (10:56 -0400)]
3453: Add ensure_unique_name=True to collection create.

9 years ago3654: redirection to newly created collection is now working.
radhika [Mon, 8 Sep 2014 14:56:12 +0000 (10:56 -0400)]
3654: redirection to newly created collection is now working.

9 years agoMerge branch 'master' into 3453-arv-list-docker-images
Peter Amstutz [Mon, 8 Sep 2014 14:53:52 +0000 (10:53 -0400)]
Merge branch 'master' into 3453-arv-list-docker-images

9 years agoAdded create#ensure_unique_name to discovery document. "Add a subproject"
Peter Amstutz [Mon, 8 Sep 2014 14:53:32 +0000 (10:53 -0400)]
Added create#ensure_unique_name to discovery document.  "Add a subproject"
button now uses "ensure_unique_name" to avoid errors when the user creates more
than one project called "New project".  refs #3822

9 years ago3453: Create links and collection objects in the specified project, even if
Peter Amstutz [Mon, 8 Sep 2014 14:43:49 +0000 (10:43 -0400)]
3453: Create links and collection objects in the specified project, even if
the docker image has already been uploaded to some other project.

9 years agoMerge branch 'master' into 3654-combine-selections
radhika [Sat, 6 Sep 2014 19:53:17 +0000 (15:53 -0400)]
Merge branch 'master' into 3654-combine-selections

9 years ago3654: slight update to redirect to newly created collection
radhika [Sat, 6 Sep 2014 19:51:34 +0000 (15:51 -0400)]
3654: slight update to redirect to newly created collection

9 years ago3654: little cleanup around the post method
radhika [Sat, 6 Sep 2014 04:36:32 +0000 (00:36 -0400)]
3654: little cleanup around the post method

9 years ago3654: use POST method to combine selections.
radhika [Sat, 6 Sep 2014 04:15:51 +0000 (00:15 -0400)]
3654: use POST method to combine selections.

9 years agoUpdated Gemfile again with published package version. refs #3822
Peter Amstutz [Fri, 5 Sep 2014 21:02:20 +0000 (17:02 -0400)]
Updated Gemfile again with published package version.  refs #3822

9 years agoMerge branch '3822-ensure-unique-names' refs #3822
Peter Amstutz [Fri, 5 Sep 2014 20:52:59 +0000 (16:52 -0400)]
Merge branch '3822-ensure-unique-names' refs #3822

Conflicts:
services/api/Gemfile
services/api/Gemfile.lock

9 years ago3822: Updated Gemfile
Peter Amstutz [Fri, 5 Sep 2014 20:48:25 +0000 (16:48 -0400)]
3822: Updated Gemfile

9 years ago3822: Fixed use of string instead of symbol in hash, added missing list separator.
Peter Amstutz [Fri, 5 Sep 2014 20:46:26 +0000 (16:46 -0400)]
3822: Fixed use of string instead of symbol in hash, added missing list separator.

9 years ago3822: Added 'ensure_unique_name' option to #create method for API server to
Peter Amstutz [Fri, 5 Sep 2014 20:23:38 +0000 (16:23 -0400)]
3822: Added 'ensure_unique_name' option to #create method for API server to
choose a unique name when there is a name collision in the database.
arv-run-pipeline-instance checks to see if there is an output file with the
same name and contents, and uses 'ensure_unique_name' when creating collection.

9 years ago3654: combine options is enabled when only data collections are selected in project...
radhika [Fri, 5 Sep 2014 20:00:24 +0000 (16:00 -0400)]
3654: combine options is enabled when only data collections are selected in project view.

9 years ago3654: add selection dropdown to collections page
radhika [Fri, 5 Sep 2014 19:17:40 +0000 (15:17 -0400)]
3654: add selection dropdown to collections page

9 years ago3654: test update
radhika [Fri, 5 Sep 2014 19:10:34 +0000 (15:10 -0400)]
3654: test update

9 years agoMerge branch 'master' into 3654-combine-selections
radhika [Fri, 5 Sep 2014 19:00:53 +0000 (15:00 -0400)]
Merge branch 'master' into 3654-combine-selections

9 years ago3654: add selection dropdown to collections page
radhika [Fri, 5 Sep 2014 18:58:05 +0000 (14:58 -0400)]
3654: add selection dropdown to collections page

9 years ago3654: add selection dropdown to collections page
radhika [Fri, 5 Sep 2014 18:45:07 +0000 (14:45 -0400)]
3654: add selection dropdown to collections page

9 years ago3654: add selection dropdown to collection#show page
radhika [Fri, 5 Sep 2014 18:17:08 +0000 (14:17 -0400)]
3654: add selection dropdown to collection#show page

9 years ago3654: add integration and funtional tests for combining collections and collection...
radhika [Fri, 5 Sep 2014 18:03:11 +0000 (14:03 -0400)]
3654: add integration and funtional tests for combining collections and collection contents.