arvados.git
10 years agoMerge branch '2221-complete-docker' (closes #2325, closes #2221)
Tim Pierce [Thu, 3 Apr 2014 19:51:48 +0000 (15:51 -0400)]
Merge branch '2221-complete-docker' (closes #2325, closes #2221)

Conflicts:
.gitignore

10 years agoSemicolon fix (refs #2325, refs #2221).
Tim Pierce [Thu, 3 Apr 2014 19:47:44 +0000 (15:47 -0400)]
Semicolon fix (refs #2325, refs #2221).

10 years agoMerge branch '2509-rake-linkchecker'
Ward Vandewege [Thu, 3 Apr 2014 19:27:51 +0000 (15:27 -0400)]
Merge branch '2509-rake-linkchecker'

10 years agoUse a simple 'open' for fetch_block (freeing up an extra filehandle). refs #2325...
Tim Pierce [Thu, 3 Apr 2014 19:25:35 +0000 (15:25 -0400)]
Use a simple 'open' for fetch_block (freeing up an extra filehandle). refs #2325, refs #2221

10 years agoResolving style comments from #2325. (refs #2325, refs #2221)
Tim Pierce [Thu, 3 Apr 2014 19:08:15 +0000 (15:08 -0400)]
Resolving style comments from #2325. (refs #2325, refs #2221)

10 years ago* README: remove numbers in headings
Ward Vandewege [Thu, 3 Apr 2014 18:27:16 +0000 (14:27 -0400)]
* README: remove numbers in headings

* linkchecker: only check file:// links

* epydoc: run against the local source tree, not against whatever
  version of the python 'arvados' package is installed

* generate: re-run epydoc on every generation

* generate: do not fail to include the epydoc output files if they are
  generated in the current run (which they now always are)

10 years agoUse quotemeta to protect shell escapes (refs #2221, #2325)
Tim Pierce [Thu, 3 Apr 2014 18:22:10 +0000 (14:22 -0400)]
Use quotemeta to protect shell escapes (refs #2221, #2325)

10 years agoSet umask to 022 when creating config files. (refs #2221)
Tim Pierce [Thu, 3 Apr 2014 18:00:16 +0000 (14:00 -0400)]
Set umask to 022 when creating config files. (refs #2221)

10 years agodocker: Install staged source on Docker images.
Brett Smith [Wed, 2 Apr 2014 20:55:24 +0000 (16:55 -0400)]
docker: Install staged source on Docker images.

A separate build step to stage source makes it easier for us to fix
permissions and do other clean-up before installing it in a Docker
image.  It also reduces code redundancy; for example, builders don't
have to worry about excluding log and tmp directories.

10 years agodocker: Tolerate existing tmp in api-image.
Brett Smith [Wed, 2 Apr 2014 20:41:50 +0000 (16:41 -0400)]
docker: Tolerate existing tmp in api-image.

10 years agodocker: `chmod go=rX` on generated files.
Brett Smith [Wed, 2 Apr 2014 20:33:59 +0000 (16:33 -0400)]
docker: `chmod go=rX` on generated files.

That's not how this is implemented, but the end result should be the
same.

10 years agodocker: Don't try shell expansion in Makefile.
Brett Smith [Wed, 2 Apr 2014 19:32:12 +0000 (15:32 -0400)]
docker: Don't try shell expansion in Makefile.

The original syntax, at least, is not supported.

10 years agodocker: Improve build.sh's Makefile finding.
Brett Smith [Wed, 2 Apr 2014 18:04:48 +0000 (14:04 -0400)]
docker: Improve build.sh's Makefile finding.

10 years agodoc: Add rake linkchecker task, and document it in the README file
Ward Vandewege [Wed, 2 Apr 2014 16:58:00 +0000 (12:58 -0400)]
doc: Add rake linkchecker task, and document it in the README file

10 years agoMerge branch '2209-correct-items-available'
Tom Clegg [Wed, 2 Apr 2014 16:40:08 +0000 (12:40 -0400)]
Merge branch '2209-correct-items-available'

closes #2209

10 years agoFix counting results in test case (count != size for an ActiveRelation).
Tom Clegg [Wed, 2 Apr 2014 16:39:52 +0000 (12:39 -0400)]
Fix counting results in test case (count != size for an ActiveRelation).

10 years agoMerge branch 'master' into 2209-correct-items-available
Tom Clegg [Wed, 2 Apr 2014 16:30:44 +0000 (12:30 -0400)]
Merge branch 'master' into 2209-correct-items-available

10 years agoReally check for duplicate items returned, instead of just calling a
Tom Clegg [Wed, 2 Apr 2014 16:30:12 +0000 (12:30 -0400)]
Really check for duplicate items returned, instead of just calling a
variable unique_uuids.

10 years agodoc: Fix Keep links in tutorial-job1.
Brett Smith [Wed, 2 Apr 2014 14:12:37 +0000 (10:12 -0400)]
doc: Fix Keep links in tutorial-job1.

10 years agoMerge branch '2470-doc-refresh'.
Brett Smith [Wed, 2 Apr 2014 14:05:01 +0000 (10:05 -0400)]
Merge branch '2470-doc-refresh'.

Closes #2470, #2490.

10 years agodoc: Implement Tom's suggested improvements.
Brett Smith [Tue, 1 Apr 2014 21:37:07 +0000 (17:37 -0400)]
doc: Implement Tom's suggested improvements.

Refs #2470.

10 years agodoc: tutorial-job1 updates and style tweaks.
Brett Smith [Mon, 31 Mar 2014 13:46:50 +0000 (09:46 -0400)]
doc: tutorial-job1 updates and style tweaks.

The major change here is that we set no_reuse on the job, to avoid
confusing people by using results from previous tutorial runs.  These
updates also reflect some minor changes in the Workbench UI.

10 years agodoc: job-and-pipeline-ref grammar fixes.
Brett Smith [Fri, 28 Mar 2014 21:23:40 +0000 (17:23 -0400)]
doc: job-and-pipeline-ref grammar fixes.

10 years agodoc: Keep topic style tweaks.
Brett Smith [Fri, 28 Mar 2014 21:06:19 +0000 (17:06 -0400)]
doc: Keep topic style tweaks.

10 years agodoc: Fix typos in tutorial-parallel.
Brett Smith [Fri, 28 Mar 2014 20:57:09 +0000 (16:57 -0400)]
doc: Fix typos in tutorial-parallel.

10 years agodoc: tutorial-job-debug update and style.
Brett Smith [Fri, 28 Mar 2014 20:51:36 +0000 (16:51 -0400)]
doc: tutorial-job-debug update and style.

* Jobs now require a "repository" parameter.
* Use environment variables to specify the job script.

10 years agodoc: Make running-pipeline-command up-to-date.
Brett Smith [Fri, 28 Mar 2014 19:47:52 +0000 (15:47 -0400)]
doc: Make running-pipeline-command up-to-date.

* @arv pipeline run@ now requires @--run-here@.
* Pipelines are now under Activity in Workbench navigation.
* The format of the example output has changed, along with all the
  Keep hashes.

10 years agodoc: Highlight "you" in reference JSON.
Brett Smith [Fri, 28 Mar 2014 14:31:59 +0000 (10:31 -0400)]
doc: Highlight "you" in reference JSON.

Since this reference provides users with raw example JSON, and doesn't
tell them to write it with @cat@, we can't rely on shell variable
expansion here.

10 years agodoc: Use $USER in tutorial JSON.
Brett Smith [Mon, 31 Mar 2014 13:51:42 +0000 (09:51 -0400)]
doc: Use $USER in tutorial JSON.

The tutorial encourages users to copy and paste command text.
However, most of the JSON needs to have a user-specific value for
"repository", which is easy to overlook.  Since we're telling users to
save JSON with @cat@, we can take advantage of shell variable
expansion to make the right thing happen automatically.

I added accompanying notes to help explain what's going on for people
who aren't copying instructions so literally.

Conflicts:
doc/user/tutorials/tutorial-firstscript.html.textile.liquid
doc/user/tutorials/tutorial-new-pipeline.html.textile.liquid

10 years agodoc: Tweak running-external-program style.
Brett Smith [Thu, 27 Mar 2014 20:00:09 +0000 (16:00 -0400)]
doc: Tweak running-external-program style.

10 years agodoc: tutorial-new-pipeline clarity.
Brett Smith [Mon, 31 Mar 2014 13:50:55 +0000 (09:50 -0400)]
doc: tutorial-new-pipeline clarity.

I renamed the "filter" job to "do_filter" to help disambiguate it a
little from "0-filter.py".

Conflicts:
doc/user/tutorials/tutorial-new-pipeline.html.textile.liquid

10 years agodoc: tutorial-firstscript style consistency.
Brett Smith [Mon, 31 Mar 2014 13:50:01 +0000 (09:50 -0400)]
doc: tutorial-firstscript style consistency.

Conflicts:
doc/user/tutorials/tutorial-firstscript.html.textile.liquid

10 years agodoc: tutorial-pipeline-workbench style+clarity.
Brett Smith [Thu, 27 Mar 2014 18:01:27 +0000 (14:01 -0400)]
doc: tutorial-pipeline-workbench style+clarity.

10 years agodoc: Fix tutorial-keep typos and consistency.
Brett Smith [Thu, 27 Mar 2014 16:46:19 +0000 (12:46 -0400)]
doc: Fix tutorial-keep typos and consistency.

10 years agodoc: Fix api-tokens typos and consistency.
Brett Smith [Thu, 27 Mar 2014 16:15:51 +0000 (12:15 -0400)]
doc: Fix api-tokens typos and consistency.

10 years agodoc: Fix ssh-access typos and consistency.
Brett Smith [Thu, 27 Mar 2014 15:56:55 +0000 (11:56 -0400)]
doc: Fix ssh-access typos and consistency.

10 years agodoc: Style and consistency in user/index.
Brett Smith [Thu, 27 Mar 2014 15:09:00 +0000 (11:09 -0400)]
doc: Style and consistency in user/index.

10 years agoMerge branch '2447-fix-workbench-search'
Tom Clegg [Wed, 2 Apr 2014 02:41:11 +0000 (22:41 -0400)]
Merge branch '2447-fix-workbench-search'

closes #2447

10 years agoFix searching on tables with no "name" column. Take care not to use
Tom Clegg [Wed, 2 Apr 2014 02:16:43 +0000 (22:16 -0400)]
Fix searching on tables with no "name" column. Take care not to use
string operators on incompatible column types when applying
where/filters.

10 years agoLoad ArvadosApiClient after configuration.
Tom Clegg [Wed, 2 Apr 2014 01:53:13 +0000 (21:53 -0400)]
Load ArvadosApiClient after configuration.

10 years agoMerge branch '2498-group-admin'
Tom Clegg [Wed, 2 Apr 2014 01:35:08 +0000 (21:35 -0400)]
Merge branch '2498-group-admin'

closes #2498

10 years agoFix down-migration: delete the system_group and automatically
Tom Clegg [Wed, 2 Apr 2014 01:27:37 +0000 (21:27 -0400)]
Fix down-migration: delete the system_group and automatically
generated links, and rename the migration.

10 years agoAdd migration to create system group in existing installations.
Tom Clegg [Wed, 2 Apr 2014 00:22:15 +0000 (20:22 -0400)]
Add migration to create system group in existing installations.

10 years agoAdd a system_group, and ensure it has can_manage permission on every
Tom Clegg [Tue, 1 Apr 2014 22:39:12 +0000 (18:39 -0400)]
Add a system_group, and ensure it has can_manage permission on every
existing and future user.

This lets us give a user access to all users' data (on read-only or
read+write basis) without also giving them system level privileges
with the is_admin flag (which would also let them override business
logic like UUID assignment).

10 years agodoc: Implement Tom's suggested improvements.
Brett Smith [Tue, 1 Apr 2014 21:37:07 +0000 (17:37 -0400)]
doc: Implement Tom's suggested improvements.

Refs #2470.

10 years agoDocument group-level administrator semantics.
Tom Clegg [Tue, 1 Apr 2014 19:36:02 +0000 (15:36 -0400)]
Document group-level administrator semantics.

10 years agoSupport group-wide administrator privileges.
Tom Clegg [Tue, 1 Apr 2014 19:16:18 +0000 (15:16 -0400)]
Support group-wide administrator privileges.

If an admin user or group has permission to read/write/manage a target
user, the admin's permission extends to all other objects on which the
target user has permission.

10 years agoIncrease max #users shown on users/activity page.
Tom Clegg [Tue, 1 Apr 2014 17:22:38 +0000 (13:22 -0400)]
Increase max #users shown on  users/activity page.

10 years agoCount distinct records for items_available, not rows generated by permission join.
Tom Clegg [Tue, 1 Apr 2014 04:21:36 +0000 (00:21 -0400)]
Count distinct records for items_available, not rows generated by permission join.

10 years agoTest no duplicate UUIDs are returned by collections.list.
Tom Clegg [Tue, 1 Apr 2014 03:47:47 +0000 (23:47 -0400)]
Test no duplicate UUIDs are returned by collections.list.

10 years agoTest items_available = items returned when limit is large.
Tom Clegg [Tue, 1 Apr 2014 03:46:16 +0000 (23:46 -0400)]
Test items_available = items returned when limit is large.

10 years agoMove keep mount point outside TASK_WORK directory to prevent conflict
Tom Clegg [Tue, 1 Apr 2014 03:29:16 +0000 (23:29 -0400)]
Move keep mount point outside TASK_WORK directory to prevent conflict
with arvados.util.clear_tmp().

10 years agoAdd repository=arvados now required by jobs.create.
Tom Clegg [Tue, 1 Apr 2014 03:28:13 +0000 (23:28 -0400)]
Add repository=arvados now required by jobs.create.

10 years agodoc: tutorial-job1 updates and style tweaks.
Brett Smith [Mon, 31 Mar 2014 13:46:50 +0000 (09:46 -0400)]
doc: tutorial-job1 updates and style tweaks.

The major change here is that we set no_reuse on the job, to avoid
confusing people by using results from previous tutorial runs.  These
updates also reflect some minor changes in the Workbench UI.

10 years agodoc: job-and-pipeline-ref grammar fixes.
Brett Smith [Fri, 28 Mar 2014 21:23:40 +0000 (17:23 -0400)]
doc: job-and-pipeline-ref grammar fixes.

10 years agodoc: Keep topic style tweaks.
Brett Smith [Fri, 28 Mar 2014 21:06:19 +0000 (17:06 -0400)]
doc: Keep topic style tweaks.

10 years agodoc: Fix typos in tutorial-parallel.
Brett Smith [Fri, 28 Mar 2014 20:57:09 +0000 (16:57 -0400)]
doc: Fix typos in tutorial-parallel.

10 years agodoc: tutorial-job-debug update and style.
Brett Smith [Fri, 28 Mar 2014 20:51:36 +0000 (16:51 -0400)]
doc: tutorial-job-debug update and style.

* Jobs now require a "repository" parameter.
* Use environment variables to specify the job script.

10 years agodoc: Make running-pipeline-command up-to-date.
Brett Smith [Fri, 28 Mar 2014 19:47:52 +0000 (15:47 -0400)]
doc: Make running-pipeline-command up-to-date.

* @arv pipeline run@ now requires @--run-here@.
* Pipelines are now under Activity in Workbench navigation.
* The format of the example output has changed, along with all the
  Keep hashes.

10 years agodoc: Highlight "you" in reference JSON.
Brett Smith [Fri, 28 Mar 2014 14:31:59 +0000 (10:31 -0400)]
doc: Highlight "you" in reference JSON.

Since this reference provides users with raw example JSON, and doesn't
tell them to write it with @cat@, we can't rely on shell variable
expansion here.

10 years agodoc: Use $USER in tutorial JSON.
Brett Smith [Mon, 31 Mar 2014 13:51:42 +0000 (09:51 -0400)]
doc: Use $USER in tutorial JSON.

The tutorial encourages users to copy and paste command text.
However, most of the JSON needs to have a user-specific value for
"repository", which is easy to overlook.  Since we're telling users to
save JSON with @cat@, we can take advantage of shell variable
expansion to make the right thing happen automatically.

I added accompanying notes to help explain what's going on for people
who aren't copying instructions so literally.

Conflicts:
doc/user/tutorials/tutorial-firstscript.html.textile.liquid
doc/user/tutorials/tutorial-new-pipeline.html.textile.liquid

10 years agodoc: Tweak running-external-program style.
Brett Smith [Thu, 27 Mar 2014 20:00:09 +0000 (16:00 -0400)]
doc: Tweak running-external-program style.

10 years agodoc: tutorial-new-pipeline clarity.
Brett Smith [Mon, 31 Mar 2014 13:50:55 +0000 (09:50 -0400)]
doc: tutorial-new-pipeline clarity.

I renamed the "filter" job to "do_filter" to help disambiguate it a
little from "0-filter.py".

Conflicts:
doc/user/tutorials/tutorial-new-pipeline.html.textile.liquid

10 years agodoc: tutorial-firstscript style consistency.
Brett Smith [Mon, 31 Mar 2014 13:50:01 +0000 (09:50 -0400)]
doc: tutorial-firstscript style consistency.

Conflicts:
doc/user/tutorials/tutorial-firstscript.html.textile.liquid

10 years agodoc: tutorial-pipeline-workbench style+clarity.
Brett Smith [Thu, 27 Mar 2014 18:01:27 +0000 (14:01 -0400)]
doc: tutorial-pipeline-workbench style+clarity.

10 years agodoc: Fix tutorial-keep typos and consistency.
Brett Smith [Thu, 27 Mar 2014 16:46:19 +0000 (12:46 -0400)]
doc: Fix tutorial-keep typos and consistency.

10 years agodoc: Fix api-tokens typos and consistency.
Brett Smith [Thu, 27 Mar 2014 16:15:51 +0000 (12:15 -0400)]
doc: Fix api-tokens typos and consistency.

10 years agodoc: Fix ssh-access typos and consistency.
Brett Smith [Thu, 27 Mar 2014 15:56:55 +0000 (11:56 -0400)]
doc: Fix ssh-access typos and consistency.

10 years agodoc: Style and consistency in user/index.
Brett Smith [Thu, 27 Mar 2014 15:09:00 +0000 (11:09 -0400)]
doc: Style and consistency in user/index.

10 years agoBump arvados-cli version to use output_is_persistent feature. refs #1932
Tom Clegg [Fri, 28 Mar 2014 21:14:52 +0000 (17:14 -0400)]
Bump arvados-cli version to use output_is_persistent feature. refs #1932

10 years agoMerge branch '1932-job-output-persistent'
Tom Clegg [Fri, 28 Mar 2014 19:21:03 +0000 (15:21 -0400)]
Merge branch '1932-job-output-persistent'

closes #1932

10 years agoFetch --tags, otherwise we miss out on commits that are tagged but are
Tom Clegg [Fri, 28 Mar 2014 18:52:18 +0000 (14:52 -0400)]
Fetch --tags, otherwise we miss out on commits that are tagged but are
not on a branch.

10 years agoAdd dependency on latest arv-run-pipeline-instance.
Tom Clegg [Fri, 28 Mar 2014 16:51:29 +0000 (12:51 -0400)]
Add dependency on latest arv-run-pipeline-instance.

10 years agoClarify c_already_finished comments.
Tom Clegg [Fri, 28 Mar 2014 16:31:14 +0000 (12:31 -0400)]
Clarify c_already_finished comments.

10 years agoMerge branch '2291-new-keepd-read-blocks'
Tim Pierce [Fri, 28 Mar 2014 15:58:32 +0000 (11:58 -0400)]
Merge branch '2291-new-keepd-read-blocks'

10 years agoAddressing code review comments (refs #2485, refs #2295)
Tim Pierce [Fri, 28 Mar 2014 15:56:08 +0000 (11:56 -0400)]
Addressing code review comments (refs #2485, refs #2295)

os.Remove(f.Name()) is clearer and less scary than os.Remove(PROC_MOUNTS).

10 years agoMerge branch 'master' into 2221-complete-docker
Tim Pierce [Fri, 28 Mar 2014 15:50:34 +0000 (11:50 -0400)]
Merge branch 'master' into 2221-complete-docker

Conflicts:
sdk/cli/bin/crunch-job

10 years agoUnit test for FindKeepVolumes (refs #2295)
Tim Pierce [Fri, 28 Mar 2014 15:08:11 +0000 (11:08 -0400)]
Unit test for FindKeepVolumes (refs #2295)

10 years agoMove "empty blob" magic number into a Collection class method, remove
Tom Clegg [Fri, 28 Mar 2014 00:51:07 +0000 (20:51 -0400)]
Move "empty blob" magic number into a Collection class method, remove
some old unused code and commented-out debug statements.

10 years agoFix some whitespace complaints.
Tom Clegg [Fri, 28 Mar 2014 00:30:08 +0000 (20:30 -0400)]
Fix some whitespace complaints.

10 years agoMerge branch 'master' into 1932-job-output-persistent
Tom Clegg [Fri, 28 Mar 2014 00:25:07 +0000 (20:25 -0400)]
Merge branch 'master' into 1932-job-output-persistent

Conflicts:
doc/user/tutorials/tutorial-firstscript.html.textile.liquid
doc/user/tutorials/tutorial-new-pipeline.html.textile.liquid
sdk/cli/bin/arv-run-pipeline-instance
services/api/db/schema.rb

10 years agoFix migration crash when script_version is nil.
Tom Clegg [Thu, 27 Mar 2014 22:30:27 +0000 (18:30 -0400)]
Fix migration crash when script_version is nil.

10 years agoIgnore "cache directory does not exist" error when clearing cache at
Tom Clegg [Thu, 27 Mar 2014 21:59:34 +0000 (17:59 -0400)]
Ignore "cache directory does not exist" error when clearing cache at
server startup.

10 years agoMerge branch '2068-reset-user'
radhika chippada [Thu, 27 Mar 2014 21:20:55 +0000 (17:20 -0400)]
Merge branch '2068-reset-user'

10 years agoreload object before unsetup
radhika chippada [Thu, 27 Mar 2014 21:20:24 +0000 (17:20 -0400)]
reload object before unsetup

10 years agodoc: Make index adorable.
Brett Smith [Thu, 27 Mar 2014 21:12:47 +0000 (17:12 -0400)]
doc: Make index adorable.

It's so cute!

10 years agominor cleanup
radhika chippada [Thu, 27 Mar 2014 19:04:46 +0000 (15:04 -0400)]
minor cleanup

10 years agoClean up the users controller
radhika chippada [Thu, 27 Mar 2014 18:48:39 +0000 (14:48 -0400)]
Clean up the users controller

10 years agoUpdate tests to match controller updates towards admin_required
radhika chippada [Thu, 27 Mar 2014 17:47:48 +0000 (13:47 -0400)]
Update tests to match controller updates towards admin_required

10 years agoUse before_filter admin_required in the users controller for setup and unsetup actions
radhika chippada [Thu, 27 Mar 2014 16:30:55 +0000 (12:30 -0400)]
Use before_filter admin_required in the users controller for setup and unsetup actions

10 years agoImprove the api call invocation
radhika chippada [Thu, 27 Mar 2014 16:09:23 +0000 (12:09 -0400)]
Improve the api call invocation

10 years agoUpdate UI to use button_to instead of link_to to deactivate the user
radhika chippada [Thu, 27 Mar 2014 15:57:18 +0000 (11:57 -0400)]
Update UI to use button_to instead of link_to to deactivate the user

10 years agoMerge branch 'master' into 2068-reset-user
radhika chippada [Thu, 27 Mar 2014 15:44:53 +0000 (11:44 -0400)]
Merge branch 'master' into 2068-reset-user

10 years agoUpdate the text on the deactivate link
radhika chippada [Thu, 27 Mar 2014 15:44:12 +0000 (11:44 -0400)]
Update the text on the deactivate link

10 years agoUse post method instead of get method when invoking the unsetup method from the api...
radhika chippada [Thu, 27 Mar 2014 15:23:16 +0000 (11:23 -0400)]
Use post method instead of get method when invoking the unsetup method from the api server.

10 years agoStory #2068: Invoke the user -> unsetup method when an admin user clicks on the deact...
radhika chippada [Thu, 27 Mar 2014 15:05:08 +0000 (11:05 -0400)]
Story #2068: Invoke the user -> unsetup method when an admin user clicks on the deactivate button in workbench

10 years agoExpose user unsetup method from the API server. Added functional tests.
radhika chippada [Thu, 27 Mar 2014 14:10:00 +0000 (10:10 -0400)]
Expose user unsetup method from the API server. Added functional tests.

10 years agoMerged branch 1741-internal-git-repo into 2333-crunch-dispatch-token-management
Peter Amstutz [Thu, 27 Mar 2014 13:27:13 +0000 (09:27 -0400)]
Merged branch 1741-internal-git-repo into 2333-crunch-dispatch-token-management

10 years agoFixed dangling 'end'
Peter Amstutz [Thu, 27 Mar 2014 12:54:53 +0000 (08:54 -0400)]
Fixed dangling 'end'

10 years agoMerge branch 'master' into 2333-crunch-dispatch-token-management
Peter Amstutz [Thu, 27 Mar 2014 12:41:10 +0000 (08:41 -0400)]
Merge branch 'master' into 2333-crunch-dispatch-token-management