arvados.git
8 years ago8319: Add environment variable to disable websockets.
Peter Amstutz [Wed, 17 Feb 2016 14:21:09 +0000 (09:21 -0500)]
8319: Add environment variable to disable websockets.

8 years ago8319: Fixes to run bcbio-nextgen CWL workflow. Now creates pipeline instance
Peter Amstutz [Fri, 29 Jan 2016 15:22:16 +0000 (10:22 -0500)]
8319: Fixes to run bcbio-nextgen CWL workflow.  Now creates pipeline instance
so that progress is visible on workbench.

8 years ago8319: Fix arv-cwl-runner file references when referencing files in Keep.
Peter Amstutz [Thu, 28 Jan 2016 21:41:08 +0000 (16:41 -0500)]
8319: Fix arv-cwl-runner file references when referencing files in Keep.

8 years agocloses #8198
radhika [Tue, 26 Jan 2016 17:10:04 +0000 (12:10 -0500)]
closes #8198
Merge branch '8198-node-ip-address'

8 years agoMerge branch 'master' into 8198-node-ip-address
radhika [Tue, 26 Jan 2016 17:09:37 +0000 (12:09 -0500)]
Merge branch 'master' into 8198-node-ip-address

8 years agorefs #8178
radhika [Tue, 26 Jan 2016 17:08:21 +0000 (12:08 -0500)]
refs #8178
Merge branch '8178-keepstore-trash-interface'

8 years agoMerge branch '8178-keepstore-trash-interface' of git.curoverse.com:arvados into 8178...
radhika [Tue, 26 Jan 2016 15:41:00 +0000 (10:41 -0500)]
Merge branch '8178-keepstore-trash-interface' of git.curoverse.com:arvados into 8178-keepstore-trash-interface

Conflicts:
services/keepstore/handlers.go
services/keepstore/volume_test.go

8 years ago8178: untrash should fail when ErrNotImplemented is returned.
radhika [Tue, 26 Jan 2016 15:38:28 +0000 (10:38 -0500)]
8178: untrash should fail when ErrNotImplemented is returned.

8 years ago8178: (for now) all volumes must return ErrNotImplemented if trash-lifetime != 0
radhika [Fri, 22 Jan 2016 22:37:15 +0000 (17:37 -0500)]
8178: (for now) all volumes must return ErrNotImplemented if trash-lifetime != 0

8 years ago8178: All three currently supported volumes return error when trash-lifetime period...
radhika [Thu, 21 Jan 2016 20:25:06 +0000 (15:25 -0500)]
8178: All three currently supported volumes return error when trash-lifetime period is not configured. azure blob and s3 volumes are updated to do so.
Returning an error is causing test failures in unix volume and hence is still a work in progress.

8 years ago8178: rename Delete api as Trash; add Untrash to volume interface; add UndeleteHandle...
radhika [Thu, 21 Jan 2016 18:59:36 +0000 (13:59 -0500)]
8178: rename Delete api as Trash; add Untrash to volume interface; add UndeleteHandler and test for this endpoint.

8 years agoMerge branch '8123-crunchstat-graphs' closes #8123
Tom Clegg [Mon, 25 Jan 2016 21:08:14 +0000 (16:08 -0500)]
Merge branch '8123-crunchstat-graphs' closes #8123

8 years ago8123: Escape HTML chars in page title.
Tom Clegg [Mon, 25 Jan 2016 21:05:56 +0000 (16:05 -0500)]
8123: Escape HTML chars in page title.

8 years ago8123: Explain existing_constraints and use a proper instance variable.
Tom Clegg [Mon, 25 Jan 2016 06:16:44 +0000 (01:16 -0500)]
8123: Explain existing_constraints and use a proper instance variable.

8 years ago8123: Fix accidental old-style class.
Tom Clegg [Mon, 25 Jan 2016 06:08:27 +0000 (01:08 -0500)]
8123: Fix accidental old-style class.

8 years ago8123: Fix type check to accommodate unicode.
Tom Clegg [Mon, 25 Jan 2016 06:00:03 +0000 (01:00 -0500)]
8123: Fix type check to accommodate unicode.

8 years ago8123: Use -v,-vv instead of --verbose,--debug.
Tom Clegg [Mon, 25 Jan 2016 05:59:46 +0000 (00:59 -0500)]
8123: Use -v,-vv instead of --verbose,--debug.

8 years ago8123: Change --include-child-jobs to --skip-child-jobs (default False).
Tom Clegg [Mon, 25 Jan 2016 02:07:42 +0000 (21:07 -0500)]
8123: Change --include-child-jobs to --skip-child-jobs (default False).

8 years ago8123: Explain mysterious memory constraint logic.
Tom Clegg [Mon, 25 Jan 2016 02:06:48 +0000 (21:06 -0500)]
8123: Explain mysterious memory constraint logic.

8 years ago8123: Update test dependencies.
Tom Clegg [Mon, 25 Jan 2016 02:05:28 +0000 (21:05 -0500)]
8123: Update test dependencies.

8 years ago8123: Include chartjs.js in package.
Tom Clegg [Sat, 23 Jan 2016 06:28:38 +0000 (01:28 -0500)]
8123: Include chartjs.js in package.

8 years agoMerge branch '8178-keepstore-trash-interface' of git.curoverse.com:arvados into 8178...
radhika [Fri, 22 Jan 2016 22:49:08 +0000 (17:49 -0500)]
Merge branch '8178-keepstore-trash-interface' of git.curoverse.com:arvados into 8178-keepstore-trash-interface

Conflicts:
services/keepstore/azure_blob_volume.go
services/keepstore/handler_test.go
services/keepstore/handlers.go
services/keepstore/keepstore.go
services/keepstore/s3_volume.go
services/keepstore/volume_test.go
services/keepstore/volume_unix.go

8 years ago8178: (for now) all volumes must return ErrNotImplemented if trash-lifetime != 0
radhika [Fri, 22 Jan 2016 22:37:15 +0000 (17:37 -0500)]
8178: (for now) all volumes must return ErrNotImplemented if trash-lifetime != 0

8 years ago8178: All three currently supported volumes return error when trash-lifetime period...
radhika [Thu, 21 Jan 2016 20:25:06 +0000 (15:25 -0500)]
8178: All three currently supported volumes return error when trash-lifetime period is not configured. azure blob and s3 volumes are updated to do so.
Returning an error is causing test failures in unix volume and hence is still a work in progress.

8 years ago8178: rename Delete api as Trash; add Untrash to volume interface; add UndeleteHandle...
radhika [Thu, 21 Jan 2016 18:59:36 +0000 (13:59 -0500)]
8178: rename Delete api as Trash; add Untrash to volume interface; add UndeleteHandler and test for this endpoint.

8 years ago8198: consider X-Forwarded-For header by way of request.repote_ip while setting node...
radhika [Fri, 22 Jan 2016 18:34:07 +0000 (13:34 -0500)]
8198: consider X-Forwarded-For header by way of request.repote_ip while setting node ip address.

8 years agoFix python sdk tests refs #6833
Peter Amstutz [Fri, 22 Jan 2016 13:23:48 +0000 (08:23 -0500)]
Fix python sdk tests refs #6833

8 years agoMerge branch '8281-arv-mount-retry' closes #8281
Tom Clegg [Thu, 21 Jan 2016 22:25:48 +0000 (17:25 -0500)]
Merge branch '8281-arv-mount-retry' closes #8281

8 years agoMerge branch '6833-test-token-expiry' closes #6833
Peter Amstutz [Thu, 21 Jan 2016 22:25:22 +0000 (17:25 -0500)]
Merge branch '6833-test-token-expiry' closes #6833

8 years agoMerge branch '7846-magic-invalidate-entry' closes #7846
Peter Amstutz [Thu, 21 Jan 2016 21:49:45 +0000 (16:49 -0500)]
Merge branch '7846-magic-invalidate-entry' closes #7846

8 years ago8281: Limit # write threads to #copies remaining, not #copies total.
Tom Clegg [Thu, 21 Jan 2016 21:10:11 +0000 (16:10 -0500)]
8281: Limit # write threads to #copies remaining, not #copies total.

8 years ago8281: Fix KeepClient retry bugs.
Tom Clegg [Thu, 21 Jan 2016 19:35:34 +0000 (14:35 -0500)]
8281: Fix KeepClient retry bugs.

get() and put() were both handling all Curl exceptions -- including
timeouts -- by marking the keep service as unusable. For example, if a
single proxy is the only service available, a single timeout was
fatal. This is fixed by setting the retry loop status to None instead
of False after curl exceptions.

put() was repeating its retry loop until it achieved the desired
number of replicas _in a single iteration_. For example, when trying
to store 2 replicas, 6 loop iterations with a single success in each
iteration would result in 6 copies being stored but put() declaring
failure. This is fixed by checking against a cumulative "done" counter
instead of the "copies done in this loop iteration" counter.

8 years ago8281: Fix arv-mount ignoring --retries argument when writing file data.
Tom Clegg [Thu, 21 Jan 2016 09:01:16 +0000 (04:01 -0500)]
8281: Fix arv-mount ignoring --retries argument when writing file data.

"num_retries" arguments get passed around extensively in arvfile.py
and collection.py in the Python SDK, but ultimately the writing of
file data is done by a _BlockManager which doesn't have any way to
accept that argument or pass it along to a KeepClient, so PUT requests
always use the CollectionWriter's KeepClient's default num_retries.

In arv-mount's case, we have been telling CollectionWriter the
num_retries we want. When CollectionWriter creates a KeepClient,
num_retries gets passed along -- normally this works around the fact
that num_retries gets lost by the _BlockManager layer. However, we
provided our own KeepClient to use instead of letting CollectionWriter
create one, and we forgot to set num_retries on our own KeepClient, so
we weren't retrying PUT requests.

8 years ago6833: Test setting small blobSignatureTtl. Fix earlier fix.
Peter Amstutz [Thu, 21 Jan 2016 20:46:53 +0000 (15:46 -0500)]
6833: Test setting small blobSignatureTtl.  Fix earlier fix.

8 years ago6833: Test to confirm that enabling polling on CollectionDirectory causes
Peter Amstutz [Thu, 21 Jan 2016 16:30:23 +0000 (11:30 -0500)]
6833: Test to confirm that enabling polling on CollectionDirectory causes
tokens to be refreshed.

8 years ago6833: Collection update file block list (to get most recent tokens) even when actual
Peter Amstutz [Thu, 21 Jan 2016 16:29:40 +0000 (11:29 -0500)]
6833: Collection update file block list (to get most recent tokens) even when actual
content hasn't changed.

8 years ago6833: Add (most of) a test case for token expiry.
Tom Clegg [Fri, 15 Jan 2016 21:20:49 +0000 (16:20 -0500)]
6833: Add (most of) a test case for token expiry.

8 years ago8178: All three currently supported volumes return error when trash-lifetime period...
radhika [Thu, 21 Jan 2016 20:25:06 +0000 (15:25 -0500)]
8178: All three currently supported volumes return error when trash-lifetime period is not configured. azure blob and s3 volumes are updated to do so.
Returning an error is causing test failures in unix volume and hence is still a work in progress.

8 years agoMerge branch '8008-package-testing' refs #8008
Peter Amstutz [Thu, 21 Jan 2016 19:07:11 +0000 (14:07 -0500)]
Merge branch '8008-package-testing' refs #8008

8 years ago8178: rename Delete api as Trash; add Untrash to volume interface; add UndeleteHandle...
radhika [Thu, 21 Jan 2016 18:59:36 +0000 (13:59 -0500)]
8178: rename Delete api as Trash; add Untrash to volume interface; add UndeleteHandler and test for this endpoint.

8 years ago7846: Better directory entry invalidation, fixes MagicDirApiError test. Also
Peter Amstutz [Thu, 21 Jan 2016 18:37:20 +0000 (13:37 -0500)]
7846: Better directory entry invalidation, fixes MagicDirApiError test.  Also
fix bug in typo in exception handler.

8 years agorefs #6833
radhika [Wed, 20 Jan 2016 21:15:12 +0000 (16:15 -0500)]
refs #6833
Merge branch '6833-arv-mount-cache-refresh'

8 years ago6833: get blobSignatureTtl from discovery document and use it to set the poll_time.
radhika [Mon, 11 Jan 2016 14:37:10 +0000 (09:37 -0500)]
6833: get blobSignatureTtl from discovery document and use it to set the poll_time.

8 years ago6833: add poll_time to CollectionDirectory.
radhika [Thu, 7 Jan 2016 18:14:05 +0000 (13:14 -0500)]
6833: add poll_time to CollectionDirectory.

8 years agoFix typo.
Ward Vandewege [Wed, 20 Jan 2016 18:19:58 +0000 (13:19 -0500)]
Fix typo.

refs #8248

8 years agocloses #8028
radhika [Wed, 20 Jan 2016 17:37:34 +0000 (12:37 -0500)]
closes #8028
Merge branch '8028-crunch-dispatch-local'

8 years ago8028: Update the stub based test to use waitGroup.Wait() instead of sleep.
radhika [Wed, 20 Jan 2016 17:33:16 +0000 (12:33 -0500)]
8028: Update the stub based test to use waitGroup.Wait() instead of sleep.

8 years ago8028: In runningCmds loop, no need to wait for process termination.
radhika [Wed, 20 Jan 2016 17:05:59 +0000 (12:05 -0500)]
8028: In runningCmds loop, no need to wait for process termination.

8 years ago8028: add command to waitGroup during run method itself; not during signal handling.
radhika [Wed, 20 Jan 2016 16:40:30 +0000 (11:40 -0500)]
8028: add command to waitGroup during run method itself; not during signal handling.

8 years ago8028: when a signal is received, terminate all running commands and wait in a WaitGroup.
radhika [Wed, 20 Jan 2016 12:16:05 +0000 (07:16 -0500)]
8028: when a signal is received, terminate all running commands and wait in a WaitGroup.

8 years ago8028: add signal handling to dispatcher.
radhika [Wed, 20 Jan 2016 02:40:59 +0000 (21:40 -0500)]
8028: add signal handling to dispatcher.

8 years ago8028: After getting list of Queued containers, instead of looking for containers...
radhika [Tue, 19 Jan 2016 17:16:51 +0000 (12:16 -0500)]
8028: After getting list of Queued containers, instead of looking for containers.ItemsAvailable, look for len(containers.Items)

8 years ago8028: crunch-dispatch-local implementation
radhika [Wed, 13 Jan 2016 16:15:28 +0000 (11:15 -0500)]
8028: crunch-dispatch-local implementation

8 years agoMerge branch '8248-explain-serialize'
Ward Vandewege [Wed, 20 Jan 2016 16:26:16 +0000 (11:26 -0500)]
Merge branch '8248-explain-serialize'

closes #8248

8 years agoDoc improvement: explain in more detail what the -serialize argument to
Ward Vandewege [Wed, 20 Jan 2016 16:25:20 +0000 (11:25 -0500)]
Doc improvement: explain in more detail what the -serialize argument to
keepstore does.

closes #8248

8 years agoMerge branch '7816-crunch2-exec' closes #7816
Peter Amstutz [Wed, 20 Jan 2016 16:04:51 +0000 (11:04 -0500)]
Merge branch '7816-crunch2-exec' closes #7816

8 years ago8123: Ignore crunchstat "caught signal:" log.
Tom Clegg [Wed, 20 Jan 2016 08:40:46 +0000 (03:40 -0500)]
8123: Ignore crunchstat "caught signal:" log.

8 years agoMerge branch '8177-keep-web-trust-all-content-flag' closes #8177
Tom Clegg [Wed, 20 Jan 2016 02:12:38 +0000 (21:12 -0500)]
Merge branch '8177-keep-web-trust-all-content-flag' closes #8177

8 years ago8177: Offer -trust-all-content option for no-wildcard installs.
Tom Clegg [Tue, 19 Jan 2016 22:38:05 +0000 (17:38 -0500)]
8177: Offer -trust-all-content option for no-wildcard installs.

Add alert about XSS on intranet sites.

8 years ago7816: CopyReaderToLog renamed to ReadWriteLines. Use Writer instead of Logger
Peter Amstutz [Tue, 19 Jan 2016 22:07:59 +0000 (17:07 -0500)]
7816: CopyReaderToLog renamed to ReadWriteLines.  Use Writer instead of Logger
to avoid unnecessary copy.

8 years ago8177: Expand trust_all_content comments.
Tom Clegg [Mon, 18 Jan 2016 21:17:17 +0000 (16:17 -0500)]
8177: Expand trust_all_content comments.

Skip whole check_uri block when trust_all_content.

Fix test name.

8 years ago8177: add trust_all_content config to Workbench.
radhika [Mon, 18 Jan 2016 05:04:48 +0000 (00:04 -0500)]
8177: add trust_all_content config to Workbench.

8 years ago7816: Rename to crunch-run
Peter Amstutz [Tue, 19 Jan 2016 21:43:54 +0000 (16:43 -0500)]
7816: Rename to crunch-run

8 years agoMerge branch '7996-keep-web-doc' closes #7996
Tom Clegg [Tue, 19 Jan 2016 04:19:35 +0000 (23:19 -0500)]
Merge branch '7996-keep-web-doc' closes #7996

8 years ago7996: Add keep-web to install TOC and server/cert lists.
Tom Clegg [Mon, 18 Jan 2016 02:45:46 +0000 (21:45 -0500)]
7996: Add keep-web to install TOC and server/cert lists.

8 years ago7816: Fixes recommended by golint.
Peter Amstutz [Fri, 15 Jan 2016 21:32:08 +0000 (16:32 -0500)]
7816: Fixes recommended by golint.

8 years ago7816: Change ThrottledLogger Stop() to Close(). Choose finalState once so that
Peter Amstutz [Fri, 15 Jan 2016 20:50:33 +0000 (15:50 -0500)]
7816: Change ThrottledLogger Stop() to Close().  Choose finalState once so that
log and container record can't go out of sync.  Add comments.

8 years ago8008: Remove workbench git version constraint.
Peter Amstutz [Fri, 15 Jan 2016 15:10:48 +0000 (10:10 -0500)]
8008: Remove workbench git version constraint.

8 years agoFix cli "update" example. No issue #
Tom Clegg [Thu, 14 Jan 2016 20:20:46 +0000 (15:20 -0500)]
Fix cli "update" example. No issue #

8 years agoMerge branch '8189-handle-large-collections-better' refs #8189
Tom Clegg [Thu, 14 Jan 2016 20:19:48 +0000 (15:19 -0500)]
Merge branch '8189-handle-large-collections-better' refs #8189

8 years ago8189: Use large page size only when fetching all pages.
Tom Clegg [Thu, 14 Jan 2016 18:15:08 +0000 (13:15 -0500)]
8189: Use large page size only when fetching all pages.

8 years ago8008: Add dependencies on libcurl and postgresql dev packages in order to build
Peter Amstutz [Thu, 14 Jan 2016 16:44:18 +0000 (11:44 -0500)]
8008: Add dependencies on libcurl and postgresql dev packages in order to build
gems.

8 years ago8189: Replace MAX_LIMIT const with max_items_per_response config.
Tom Clegg [Thu, 14 Jan 2016 16:27:08 +0000 (11:27 -0500)]
8189: Replace MAX_LIMIT const with max_items_per_response config.

8 years ago8189: Fix too-small page size in "fetch all pages" code.
Ward Vandewege [Thu, 14 Jan 2016 16:01:04 +0000 (11:01 -0500)]
8189: Fix too-small page size in "fetch all pages" code.

Python SDK and workbench effectively default to the API server's
MAX_LIMIT when requesting a list of objects, in those cases where no
explicit limit is set in the client code.

8 years ago8008: Add git dependency to api server and workbench.
Peter Amstutz [Wed, 13 Jan 2016 21:21:27 +0000 (16:21 -0500)]
8008: Add git dependency to api server and workbench.

8 years ago8123: Fix crunchstat formatting error and resulting crunchstat-summary crash.
Tom Clegg [Wed, 13 Jan 2016 15:18:17 +0000 (10:18 -0500)]
8123: Fix crunchstat formatting error and resulting crunchstat-summary crash.

8 years ago8123: Add option to include stats from child jobs.
Tom Clegg [Thu, 24 Dec 2015 18:51:35 +0000 (13:51 -0500)]
8123: Add option to include stats from child jobs.

8 years ago8123: Generate multiple sets of charts when data source is a pipeline instance.
Tom Clegg [Wed, 23 Dec 2015 19:09:37 +0000 (14:09 -0500)]
8123: Generate multiple sets of charts when data source is a pipeline instance.

8 years ago8123: Add option (--format html) to generate canvasjs charts.
Tom Clegg [Wed, 23 Dec 2015 16:39:14 +0000 (11:39 -0500)]
8123: Add option (--format html) to generate canvasjs charts.

8 years ago8123: Aim 5% below GiB memory size boundaries.
Tom Clegg [Tue, 22 Dec 2015 21:16:15 +0000 (16:16 -0500)]
8123: Aim 5% below GiB memory size boundaries.

8 years ago8123: Recommend more economical values for resource_constraints.
Tom Clegg [Mon, 21 Dec 2015 21:53:37 +0000 (16:53 -0500)]
8123: Recommend more economical values for resource_constraints.

8 years ago8123: Add --pipeline-instance mode: generate a report for each finished component.
Tom Clegg [Mon, 21 Dec 2015 19:42:44 +0000 (14:42 -0500)]
8123: Add --pipeline-instance mode: generate a report for each finished component.

8 years agoMerge branch '8014-rails-postinst-doc-update-wip'
Brett Smith [Tue, 12 Jan 2016 01:23:56 +0000 (20:23 -0500)]
Merge branch '8014-rails-postinst-doc-update-wip'

Refs #8014.  Closes #8111.

8 years ago8014: Install guide uses new Rails postinst scripts for configuration.
Brett Smith [Tue, 5 Jan 2016 22:33:11 +0000 (17:33 -0500)]
8014: Install guide uses new Rails postinst scripts for configuration.

8 years ago7816: Converted testing to use stubbed out ThinDockerClient instead of real Docker.
Peter Amstutz [Wed, 6 Jan 2016 21:38:58 +0000 (16:38 -0500)]
7816: Converted testing to use stubbed out ThinDockerClient instead of real Docker.

8 years ago7816: Crunch2 executor prototype work in progress.
Peter Amstutz [Wed, 6 Jan 2016 15:52:07 +0000 (10:52 -0500)]
7816: Crunch2 executor prototype work in progress.

8 years ago7816: Update Go SDK to use correct block locator pattern. Change FileToken
Peter Amstutz [Wed, 6 Jan 2016 15:51:28 +0000 (10:51 -0500)]
7816: Update Go SDK to use correct block locator pattern.  Change FileToken
string in manifest to FileStreamSegment struct.

8 years agocloses #7607
radhika [Tue, 5 Jan 2016 22:37:46 +0000 (17:37 -0500)]
closes #7607
Merge branch '7607-getting-started-flag'

8 years agoMerge branch 'master' into 7607-getting-started-flag
radhika [Tue, 5 Jan 2016 22:37:08 +0000 (17:37 -0500)]
Merge branch 'master' into 7607-getting-started-flag

8 years agoMerge branch '8095-install-guide-rails-sudo-wip'
Brett Smith [Tue, 5 Jan 2016 19:54:42 +0000 (14:54 -0500)]
Merge branch '8095-install-guide-rails-sudo-wip'

Closes #8095, #8096.

8 years ago8095: Make install guide bundle commands more consistent.
Brett Smith [Thu, 31 Dec 2015 16:23:34 +0000 (11:23 -0500)]
8095: Make install guide bundle commands more consistent.

* Always instruct the user to use `sudo -u`.  This prevents the
  commands from generating cache files that the web server can't write
  later.
* Always execute the command in the server's main directory.  This
  helps people run on automatic: if they leave a shell session open at
  the API server directory, they can paste in a combination of Rails
  console and script commands without `cd`ing around.
* Always give both RVM and non-RVM instructions.  There might be a
  good way to streamline this, e.g., by telling them to use rvmsudo
  when available, but that can be a later optimization.

8 years agoAdd pycurl version constraint to Python SDK because of breaking API change, refs...
Peter Amstutz [Tue, 5 Jan 2016 17:44:42 +0000 (12:44 -0500)]
Add pycurl version constraint to Python SDK because of breaking API change, refs #8104

8 years ago7607: updated user_profile_test to set getting_started config in test.
radhika [Tue, 5 Jan 2016 13:32:09 +0000 (08:32 -0500)]
7607: updated user_profile_test to set getting_started config in test.

8 years ago7607: Update application layout tests; by default getting_started is disabled and...
radhika [Mon, 4 Jan 2016 23:42:34 +0000 (18:42 -0500)]
7607: Update application layout tests; by default getting_started is disabled and hence the help menu will not include this option.
Also, added an additional test case for user with profile but no getting_started flag and expect the popup upon first login.

8 years ago7942: Skip unreliable test. refs #7942
Tom Clegg [Mon, 4 Jan 2016 21:02:54 +0000 (16:02 -0500)]
7942: Skip unreliable test. refs #7942

8 years agoMerge branch '7957-new-software-collections-install-wip'
Brett Smith [Mon, 4 Jan 2016 20:07:39 +0000 (15:07 -0500)]
Merge branch '7957-new-software-collections-install-wip'

Closes #7957, #8097.

8 years ago7957: Update Software Collections instructions in install guide.
Brett Smith [Thu, 31 Dec 2015 17:08:17 +0000 (12:08 -0500)]
7957: Update Software Collections instructions in install guide.

* Document the process we currently follow on CentOS 6.
* Add a reference for RHEL instructions.
* Move noteboxes up, so people can follow the instructions
  linearly ("enable Software Collections, then install the packages").

8 years agoMerge branch '7816-exit-code' refs #7816
Peter Amstutz [Mon, 4 Jan 2016 19:34:47 +0000 (14:34 -0500)]
Merge branch '7816-exit-code' refs #7816

8 years ago8080: Pull c.reload etc out of the assert_raises. Remove spurious blank lines.
Peter Amstutz [Mon, 4 Jan 2016 19:34:12 +0000 (14:34 -0500)]
8080: Pull c.reload etc out of the assert_raises.  Remove spurious blank lines.

8 years agoMerge branch '8082-col-markup' refs #8082
Tom Clegg [Mon, 4 Jan 2016 17:58:17 +0000 (12:58 -0500)]
Merge branch '8082-col-markup' refs #8082