arvados.git
9 years agoMerge branch '6638-backport-deps' refs #6638
Tom Clegg [Fri, 14 Aug 2015 21:34:02 +0000 (17:34 -0400)]
Merge branch '6638-backport-deps' refs #6638

9 years agoMerge branch '6950-install-guide-job-test-wip'
Brett Smith [Fri, 14 Aug 2015 19:04:27 +0000 (15:04 -0400)]
Merge branch '6950-install-guide-job-test-wip'

Closes #6950, #6960.

9 years ago6950: Improve "make a job" check in Crunch dispatch install guide.
Brett Smith [Tue, 11 Aug 2015 21:38:21 +0000 (17:38 -0400)]
6950: Improve "make a job" check in Crunch dispatch install guide.

* This check ensures that Crunch has something to dispatch.  It
  doesn't test anything about the disptacher itself.  Move it up, as a
  prerequisite sanity check.
* Explain what success looks like.
* Explain common error causes and how to debug them.
* Better markup for the user input.

9 years ago6638: 6934: Fix up shellinabox example and add to package.
Tom Clegg [Thu, 13 Aug 2015 14:34:12 +0000 (10:34 -0400)]
6638: 6934: Fix up shellinabox example and add to package.

9 years ago6638: Add package deps for llfuse and pycurl backports
Tom Clegg [Wed, 12 Aug 2015 15:52:13 +0000 (11:52 -0400)]
6638: Add package deps for llfuse and pycurl backports

9 years agocloses #6572
radhika [Thu, 13 Aug 2015 15:13:06 +0000 (11:13 -0400)]
closes #6572
Merge branch '6572-doc-copy-pipeline'

9 years ago6572: minor section title updates
radhika [Thu, 13 Aug 2015 15:12:32 +0000 (11:12 -0400)]
6572: minor section title updates

9 years agoMerge branch 'master' into 6572-doc-copy-pipeline
radhika [Thu, 13 Aug 2015 15:09:56 +0000 (11:09 -0400)]
Merge branch 'master' into 6572-doc-copy-pipeline

9 years ago6638: Add python sdk package dependencies.
Tom Clegg [Wed, 12 Aug 2015 15:49:02 +0000 (11:49 -0400)]
6638: Add python sdk package dependencies.

9 years agoMerge branch '6934-pam' refs #6934
Tom Clegg [Thu, 13 Aug 2015 03:04:35 +0000 (23:04 -0400)]
Merge branch '6934-pam' refs #6934

9 years ago6934: Recommend system-log-daemon metapackage, not rsyslog specifically.
Tom Clegg [Thu, 13 Aug 2015 02:37:08 +0000 (22:37 -0400)]
6934: Recommend system-log-daemon metapackage, not rsyslog specifically.

9 years ago6934: Move integration tests into separate dir.
Tom Clegg [Wed, 12 Aug 2015 20:41:38 +0000 (16:41 -0400)]
6934: Move integration tests into separate dir.

Now, "python setup.py --test-suite integration_tests" will run
integration tests, and "python setup.py" won't -- regardless of
whether you are root, and what your pam config looks like.

9 years ago6934: Fix Dockerfile instructions. Use default test port. Use arvados/foo tag convention.
Tom Clegg [Wed, 12 Aug 2015 19:59:37 +0000 (15:59 -0400)]
6934: Fix Dockerfile instructions. Use default test port. Use arvados/foo tag convention.

9 years agoMerge branch '5824-go-sdk' refs #5824
Tom Clegg [Wed, 12 Aug 2015 17:55:56 +0000 (13:55 -0400)]
Merge branch '5824-go-sdk' refs #5824

9 years ago5824: Merge branch 'master' into 5824-go-sdk
Tom Clegg [Wed, 12 Aug 2015 17:45:43 +0000 (13:45 -0400)]
5824: Merge branch 'master' into 5824-go-sdk

9 years ago6934: Add pam_sm tests.
Tom Clegg [Tue, 11 Aug 2015 14:46:28 +0000 (10:46 -0400)]
6934: Add pam_sm tests.

9 years ago6934: Split module
Tom Clegg [Tue, 11 Aug 2015 14:32:49 +0000 (10:32 -0400)]
6934: Split module

9 years ago6934: Put wrapper in /lib/security/ instead of writing dist-packages path in config...
Tom Clegg [Tue, 11 Aug 2015 06:26:51 +0000 (02:26 -0400)]
6934: Put wrapper in /lib/security/ instead of writing dist-packages path in config file. Make integration test work.

9 years ago6934: Add packaging instructions
Tom Clegg [Mon, 10 Aug 2015 14:42:17 +0000 (10:42 -0400)]
6934: Add packaging instructions

9 years agoMerge branch 'master' into 6572-doc-copy-pipeline
radhika [Wed, 12 Aug 2015 15:05:14 +0000 (11:05 -0400)]
Merge branch 'master' into 6572-doc-copy-pipeline

9 years ago5824: Test invalid argument vs. 404.
Tom Clegg [Tue, 11 Aug 2015 21:27:07 +0000 (17:27 -0400)]
5824: Test invalid argument vs. 404.

9 years ago6938: Install guide covers git server before standard objects.
Brett Smith [Tue, 11 Aug 2015 19:59:53 +0000 (15:59 -0400)]
6938: Install guide covers git server before standard objects.

The standard objects page covers creating the arvados git repository,
which requires Git hosting to be set up already.  It also feels like
this flows a little nicer because currently the Git server must be on
the same host as the API server.

Closes #6938.

9 years ago5824: Add tests for UUIDMatch and PDHMatch.
Tom Clegg [Tue, 11 Aug 2015 19:38:40 +0000 (15:38 -0400)]
5824: Add tests for UUIDMatch and PDHMatch.

9 years ago5824: Return InvalidArgument (not 404) for poor argument choices that do not involve...
Tom Clegg [Tue, 11 Aug 2015 19:37:50 +0000 (15:37 -0400)]
5824: Return InvalidArgument (not 404) for poor argument choices that do not involve real HTTP failures.

9 years agoMerge branch '6260-work-queue-status' refs #6260
Tom Clegg [Tue, 11 Aug 2015 17:51:09 +0000 (13:51 -0400)]
Merge branch '6260-work-queue-status' refs #6260

9 years ago6572: update to make it clear that the user can access anonymous token to use arv...
radhika [Tue, 11 Aug 2015 16:13:36 +0000 (12:13 -0400)]
6572: update to make it clear that the user can access anonymous token to use arv-copy.

9 years ago6260: Add explanatory comment about testing /status.json.
Tom Clegg [Tue, 11 Aug 2015 15:13:34 +0000 (11:13 -0400)]
6260: Add explanatory comment about testing /status.json.

9 years ago6260: Rename ReportDone to DoneItem.
Tom Clegg [Tue, 11 Aug 2015 15:07:28 +0000 (11:07 -0400)]
6260: Rename ReportDone to DoneItem.

9 years ago6260: Improve Gate explanation.
Tom Clegg [Tue, 11 Aug 2015 15:07:13 +0000 (11:07 -0400)]
6260: Improve Gate explanation.

9 years agoMerge branch 'master' into 6572-doc-copy-pipeline
radhika [Tue, 11 Aug 2015 14:47:02 +0000 (10:47 -0400)]
Merge branch 'master' into 6572-doc-copy-pipeline

9 years ago5824: Add test for nonexistent resource type.
Tom Clegg [Tue, 11 Aug 2015 00:45:38 +0000 (20:45 -0400)]
5824: Add test for nonexistent resource type.

9 years ago5824: Document ClientPool.
Tom Clegg [Tue, 11 Aug 2015 00:39:39 +0000 (20:39 -0400)]
5824: Document ClientPool.

9 years ago5824: Doc/comment fixes, add test for "Get empty UUID"
Tom Clegg [Tue, 11 Aug 2015 00:39:25 +0000 (20:39 -0400)]
5824: Doc/comment fixes, add test for "Get empty UUID"

9 years ago5824: Fix up comments for godoc.
Tom Clegg [Mon, 10 Aug 2015 23:51:27 +0000 (19:51 -0400)]
5824: Fix up comments for godoc.

9 years ago5824: Add UUID and PDH matchers.
Tom Clegg [Mon, 3 Aug 2015 04:39:28 +0000 (00:39 -0400)]
5824: Add UUID and PDH matchers.

9 years ago5824: Do not JSON-encode string params. Fixup comments for godoc.
Tom Clegg [Mon, 3 Aug 2015 04:38:36 +0000 (00:38 -0400)]
5824: Do not JSON-encode string params. Fixup comments for godoc.

9 years ago5824: Use fmt "%+q" instead of custom escaping.
Tom Clegg [Mon, 3 Aug 2015 04:36:46 +0000 (00:36 -0400)]
5824: Use fmt "%+q" instead of custom escaping.

9 years ago5824: Add Get() method to arvadosclient.
Tom Clegg [Thu, 23 Jul 2015 04:01:52 +0000 (00:01 -0400)]
5824: Add Get() method to arvadosclient.

9 years agoShut down API server after suite (noticed during 5824, otherwise no issue #)
Tom Clegg [Wed, 17 Jun 2015 04:47:12 +0000 (00:47 -0400)]
Shut down API server after suite (noticed during 5824, otherwise no issue #)

9 years ago5824: Move client pool to SDK.
Tom Clegg [Fri, 12 Jun 2015 06:43:19 +0000 (02:43 -0400)]
5824: Move client pool to SDK.

9 years ago5824: Move quoted-logging function to SDK.
Tom Clegg [Fri, 12 Jun 2015 05:53:05 +0000 (01:53 -0400)]
5824: Move quoted-logging function to SDK.

9 years ago5824: gofmt
Tom Clegg [Wed, 17 Jun 2015 05:57:33 +0000 (01:57 -0400)]
5824: gofmt

9 years ago5824: Move spying ResponseWriter to SDK.
Tom Clegg [Fri, 12 Jun 2015 05:39:27 +0000 (01:39 -0400)]
5824: Move spying ResponseWriter to SDK.

9 years ago5824: Move HTTP server code to SDK.
Tom Clegg [Fri, 12 Jun 2015 05:01:52 +0000 (01:01 -0400)]
5824: Move HTTP server code to SDK.

9 years ago5824: Move request auth code into an SDK package. Support more ways of passing tokens.
Tom Clegg [Thu, 21 May 2015 04:33:56 +0000 (00:33 -0400)]
5824: Move request auth code into an SDK package. Support more ways of passing tokens.

9 years agocloses #6858
Bryan Cosca [Mon, 10 Aug 2015 20:11:13 +0000 (16:11 -0400)]
closes #6858
Merge branch '6858-job-re-run-documentation'

9 years agorefs #6827
radhika [Mon, 10 Aug 2015 18:35:16 +0000 (14:35 -0400)]
refs #6827
Merge branch '6827-short-token'

9 years agoImprove crunch-dispatch runit script in install guide.
Brett Smith [Mon, 10 Aug 2015 18:23:09 +0000 (14:23 -0400)]
Improve crunch-dispatch runit script in install guide.

* Modernize crunch-dispatch's prerequisites.
* Document what this script is.
* Consolidate environment variables for easier configuration.

No issue #.

9 years agoInclude example service script for keepproxy.
Brett Smith [Mon, 10 Aug 2015 18:17:59 +0000 (14:17 -0400)]
Include example service script for keepproxy.

Conveniently you just need this one line, which should work equally
well in all kinds of supervisors.  No issue #.

9 years ago6827: fix error in setting valid token.
radhika [Mon, 10 Aug 2015 18:32:50 +0000 (14:32 -0400)]
6827: fix error in setting valid token.

9 years ago6827: set validApiToken flag after ensuring that getting list of repositories work...
radhika [Mon, 10 Aug 2015 18:20:25 +0000 (14:20 -0400)]
6827: set validApiToken flag after ensuring that getting list of repositories work with the given credentials.

9 years agoMerge branch 'master' into 6827-short-token
radhika [Mon, 10 Aug 2015 18:19:07 +0000 (14:19 -0400)]
Merge branch 'master' into 6827-short-token

9 years ago6827: Test logging handler with short token.
Tom Clegg [Mon, 10 Aug 2015 17:07:58 +0000 (13:07 -0400)]
6827: Test logging handler with short token.

9 years ago6260: Pull entire status object out of WorkQueue atomically.
Tom Clegg [Mon, 10 Aug 2015 16:45:45 +0000 (12:45 -0400)]
6260: Pull entire status object out of WorkQueue atomically.

9 years ago6260: Expose queue sizes in /status.json. Fix sleep/race in trash_worker_test.
Tom Clegg [Mon, 10 Aug 2015 15:56:48 +0000 (11:56 -0400)]
6260: Expose queue sizes in /status.json. Fix sleep/race in trash_worker_test.

9 years ago6260: gofmt
Tom Clegg [Thu, 6 Aug 2015 03:38:12 +0000 (23:38 -0400)]
6260: gofmt

9 years ago6260: Fix races in keepstore tests. Expose WorkQueue in-progress/queued stats.
Tom Clegg [Thu, 6 Aug 2015 03:38:05 +0000 (23:38 -0400)]
6260: Fix races in keepstore tests. Expose WorkQueue in-progress/queued stats.

9 years agocloses #6827
radhika [Mon, 10 Aug 2015 15:41:12 +0000 (11:41 -0400)]
closes #6827
Merge branch '6827-no-passwords-in-logs'

9 years ago6827: add a comment that only the first 10 characters of a valid token are logged.
radhika [Mon, 10 Aug 2015 15:40:24 +0000 (11:40 -0400)]
6827: add a comment that only the first 10 characters of a valid token are logged.

9 years agoMerge branch 'master' into 6827-no-passwords-in-logs
radhika [Mon, 10 Aug 2015 15:33:32 +0000 (11:33 -0400)]
Merge branch 'master' into 6827-no-passwords-in-logs

9 years ago6572: add a new page in install guide to "copy a pipeline template from Curoverse...
radhika [Mon, 10 Aug 2015 15:25:02 +0000 (11:25 -0400)]
6572: add a new page in install guide to "copy a pipeline template from Curoverse cloud" using arv-copy.

9 years ago6934: Load config from pam conf instead of yaml. Add docker/integration tests and...
Tom Clegg [Sun, 9 Aug 2015 05:05:05 +0000 (01:05 -0400)]
6934: Load config from pam conf instead of yaml. Add docker/integration tests and example configs.

9 years ago6934: Improve and test logging
Tom Clegg [Sat, 8 Aug 2015 15:32:44 +0000 (11:32 -0400)]
6934: Improve and test logging

9 years ago6934: Replace custom config with yaml. Simplify code path.
Tom Clegg [Sat, 8 Aug 2015 15:17:38 +0000 (11:17 -0400)]
6934: Replace custom config with yaml. Simplify code path.

9 years ago6934: Add arvados_pam package.
Tom Clegg [Sat, 8 Aug 2015 02:50:24 +0000 (22:50 -0400)]
6934: Add arvados_pam package.

9 years agoMerge branch '6844-py-mem-leak' closes #6844
Tom Clegg [Fri, 7 Aug 2015 17:57:15 +0000 (13:57 -0400)]
Merge branch '6844-py-mem-leak' closes #6844

9 years ago6844: Clean up websocket tests, fix possible deadlock, reduce unnecessary sleep().
Tom Clegg [Fri, 7 Aug 2015 17:55:33 +0000 (13:55 -0400)]
6844: Clean up websocket tests, fix possible deadlock, reduce unnecessary sleep().

* Use onevent=q.put_nowait, so "too many events" raises Queue.Full
  instead of blocking the websocket thread.

* Simplify test strategy: get the events we expect (waiting <5s for
  each), then make sure no more events arrive for >2s.

* Delete "no logs arrive from 1 day in the future" test:
  indistinguishable from "no logs arrive from 1 hour in the future".

* Delete "use today's date, with no time, as a threshold" test:
  indistinguishable from "can fetch logs 1 hour in the past"

* De-duplicate strftime(), datetime arithmetic, and "how to ask for
  logs starting at time X" logic.

* Express timestamp thresholds in ISO8601. Existing tests continue to
  use localtime. Two new tests use UTC.

9 years ago6827: log only valid token and only the first 10 characters.
radhika [Fri, 7 Aug 2015 15:25:51 +0000 (11:25 -0400)]
6827: log only valid token and only the first 10 characters.

9 years agoMake rvm-exec version in crunch-dispatch run script less specific.
Brett Smith [Fri, 7 Aug 2015 12:59:40 +0000 (08:59 -0400)]
Make rvm-exec version in crunch-dispatch run script less specific.

Any Ruby 2.1 is fine; we don't specifically need 2.1.1.  We use
`default` elsewhere throughout our documentation, so follow that
pattern here.  No issue #.

9 years agoAdd Gitolite UMASK setting to install guide.
Brett Smith [Fri, 7 Aug 2015 12:54:13 +0000 (08:54 -0400)]
Add Gitolite UMASK setting to install guide.

No issue #.

9 years agoAdd client_max_body_size to Nginx install configurations.
Brett Smith [Fri, 7 Aug 2015 12:50:48 +0000 (08:50 -0400)]
Add client_max_body_size to Nginx install configurations.

Nginx's default value for this setting is 1m, so adjusting it is all
but required to do useful work.  No issue #.

9 years agoHighlight dynamic fields in Keep service registration instructions.
Brett Smith [Fri, 7 Aug 2015 12:44:27 +0000 (08:44 -0400)]
Highlight dynamic fields in Keep service registration instructions.

No issue #.

9 years agoInstall Git in shell server install guide.
Brett Smith [Fri, 7 Aug 2015 12:42:38 +0000 (08:42 -0400)]
Install Git in shell server install guide.

I don't think we expressly use curl for anything, but reusing the
install template seemed easy enough.  In the future we might want to
expand this to a list of packages that are useful for Arvados work
generally (like maybe jq), but I wanted to keep this commit simple.

No issue #.

9 years agoRemove redundant console line from Workbench install guide.
Brett Smith [Fri, 7 Aug 2015 12:38:59 +0000 (08:38 -0400)]
Remove redundant console line from Workbench install guide.

No issue #.

9 years ago6844: Clear inserted data/logs after websocket tests.
Tom Clegg [Fri, 7 Aug 2015 05:26:57 +0000 (01:26 -0400)]
6844: Clear inserted data/logs after websocket tests.

9 years ago6844: Do not use inspect.getcallargs: it leaks memory. Passing num_retries as a posit...
Tom Clegg [Fri, 7 Aug 2015 03:35:42 +0000 (03:35 +0000)]
6844: Do not use inspect.getcallargs: it leaks memory. Passing num_retries as a positional argument is no longer supported.

9 years ago6844: Always write a valid \n-terminated manifest. Confine exception-catching to...
Tom Clegg [Fri, 7 Aug 2015 03:33:26 +0000 (03:33 +0000)]
6844: Always write a valid \n-terminated manifest. Confine exception-catching to expected exceptions.

9 years ago6844: Skip uselessly writing unsigned manifest to Keep.
Tom Clegg [Fri, 7 Aug 2015 03:30:31 +0000 (03:30 +0000)]
6844: Skip uselessly writing unsigned manifest to Keep.

9 years ago6844: Return valid locator (hash+size) if 0 copies requested.
Tom Clegg [Fri, 7 Aug 2015 03:22:55 +0000 (03:22 +0000)]
6844: Return valid locator (hash+size) if 0 copies requested.

9 years agoAPI server install guide suggests a more likely websocket_address.
Brett Smith [Thu, 6 Aug 2015 21:46:24 +0000 (17:46 -0400)]
API server install guide suggests a more likely websocket_address.

/websocket is hardcoded as the websocket endpoint in our own code, so
that's where it'll be when people use the provided nginx configuration.
No issue #.

9 years agoMerge branch '6858-job-re-run-documentation'
Bryan Cosca [Thu, 6 Aug 2015 20:27:11 +0000 (16:27 -0400)]
Merge branch '6858-job-re-run-documentation'
closes #6858

9 years ago6858: Fixed syntax and added notes to re-use the same hashes from previous runs
Bryan Cosca [Thu, 6 Aug 2015 19:06:34 +0000 (15:06 -0400)]
6858: Fixed syntax and added notes to re-use the same hashes from previous runs

9 years ago6858: Added new section 'Re-using your pipeline run' and moved all version control...
Bryan Cosca [Thu, 6 Aug 2015 18:22:31 +0000 (14:22 -0400)]
6858: Added new section 'Re-using your pipeline run' and moved all version control parameters there for ease of reading. Added more explanation of all parameters

9 years ago6858: Added note about job reproducibility and version control with arvados_sdk_versi...
Bryan Cosca [Thu, 6 Aug 2015 15:54:42 +0000 (11:54 -0400)]
6858: Added note about job reproducibility and version control with arvados_sdk_version, script_version, and docker_image to Writing a Pipeline template

9 years ago6851: reorder install guide pages; right after api server, install workbench, shell...
radhika [Thu, 6 Aug 2015 12:48:46 +0000 (08:48 -0400)]
6851: reorder install guide pages; right after api server, install workbench, shell server and standard objects.

9 years agoHaha, no seriously, don't deploy Workbench with snakeoil certs.
Brett Smith [Thu, 6 Aug 2015 19:48:24 +0000 (15:48 -0400)]
Haha, no seriously, don't deploy Workbench with snakeoil certs.

No issue #.

9 years agocloses #6880
radhika [Thu, 6 Aug 2015 19:33:15 +0000 (15:33 -0400)]
closes #6880
closes #6916
Merge branch '6880-remove-user-delete-button'

9 years ago6880: improved deletable? check
radhika [Thu, 6 Aug 2015 19:31:52 +0000 (15:31 -0400)]
6880: improved deletable? check

9 years agoMerge branch 'master' into 6880-remove-user-delete-button
radhika [Thu, 6 Aug 2015 19:21:45 +0000 (15:21 -0400)]
Merge branch 'master' into 6880-remove-user-delete-button

9 years agocrunch-dispatch preserves LD_LIBRARY_PATH environment variable.
Brett Smith [Thu, 6 Aug 2015 17:21:09 +0000 (13:21 -0400)]
crunch-dispatch preserves LD_LIBRARY_PATH environment variable.

This helps it run better in environments using Software Collections to
satisfy dependencies.  No issue #.

9 years agoInstall guide notes that snakeoil certs break browser uploads.
Brett Smith [Thu, 6 Aug 2015 16:52:20 +0000 (12:52 -0400)]
Install guide notes that snakeoil certs break browser uploads.

You know, with all the usual caveats that users theoretically control
what certs their browser does and doesn't trust, etc.  No issue #.

9 years agoAdd perl-Crypt-SSLeay as a Perl SDK dependency on Red Hat.
Brett Smith [Thu, 6 Aug 2015 16:14:05 +0000 (12:14 -0400)]
Add perl-Crypt-SSLeay as a Perl SDK dependency on Red Hat.

No issue #.

9 years agoQuote `git_repo_ssh_base` value in git install guide.
Brett Smith [Thu, 6 Aug 2015 16:10:42 +0000 (12:10 -0400)]
Quote `git_repo_ssh_base` value in git install guide.

Without this, the YAML gem complains that you're trying to do some
unallowed variable interpolation.  No issue #.

9 years agoFix `websocket_address` typo throughout API install guide.
Brett Smith [Thu, 6 Aug 2015 16:07:11 +0000 (12:07 -0400)]
Fix `websocket_address` typo throughout API install guide.

No issue #.

9 years agoAdd `bundle exec` needed to run script in keepproxy install guide.
Brett Smith [Thu, 6 Aug 2015 16:04:51 +0000 (12:04 -0400)]
Add `bundle exec` needed to run script in keepproxy install guide.

No issue #.

9 years agoDo not split partition config across lines. No issue #
Tom Clegg [Thu, 6 Aug 2015 16:00:31 +0000 (12:00 -0400)]
Do not split partition config across lines. No issue #

slurm.conf(5) from slurm 2.3.4: "Each line of partition configuration
information should represent a different partition."

9 years ago6880: added deletable? method and used to determine whether or not to show this butto...
radhika [Thu, 6 Aug 2015 16:00:20 +0000 (12:00 -0400)]
6880: added deletable? method and used to determine whether or not to show this button in the delete_object_button partial.
6916: created and moved logic into show_home_button partial rather than determine whether or not to show the button in the generic view.

9 years agoAdded note about job reproducibility and version control with arvados_sdk_version...
Bryan Cosca [Thu, 6 Aug 2015 15:54:42 +0000 (11:54 -0400)]
Added note about job reproducibility and version control with arvados_sdk_version, script_version, and docker_image to Writing a Pipeline template

9 years ago6880: Omit delete button from users index table; add controller tests.
radhika [Thu, 6 Aug 2015 14:57:14 +0000 (10:57 -0400)]
6880: Omit delete button from users index table; add controller tests.
6916: Show Home link in users page only and not in all other pages accessed via admin settings menu such as /repositories page; add controller tests.

9 years agocloses #6851
radhika [Thu, 6 Aug 2015 12:50:45 +0000 (08:50 -0400)]
closes #6851
Merge branch '6851-install-guide-flow'