arvados.git
9 years ago4027: Fixups suggested by code review. 4027-sdk-constraint-reuse-wip
Brett Smith [Tue, 18 Nov 2014 13:52:15 +0000 (08:52 -0500)]
4027: Fixups suggested by code review.

9 years ago4027: Add unit test suggested by code review.
Brett Smith [Mon, 17 Nov 2014 22:31:12 +0000 (17:31 -0500)]
4027: Add unit test suggested by code review.

9 years ago4027: API server considers arvados_sdk_version for Job reuse.
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.

9 years agocloses #3177
radhika [Fri, 14 Nov 2014 02:29:17 +0000 (21:29 -0500)]
closes #3177
Merge branch '3177-collection-choose-files'

9 years ago3177: use no left padding when collection files preview panel is used in file chooser...
radhika [Fri, 14 Nov 2014 02:12:41 +0000 (21:12 -0500)]
3177: use no left padding when collection files preview panel is used in file chooser dialog.

9 years agoMerge branch 'master' into 3177-collection-choose-files
radhika [Fri, 14 Nov 2014 01:45:50 +0000 (20:45 -0500)]
Merge branch 'master' into 3177-collection-choose-files

9 years agoMerge branch '2853-rendezvous' closes #2853
Tom Clegg [Thu, 13 Nov 2014 14:47:54 +0000 (09:47 -0500)]
Merge branch '2853-rendezvous' closes #2853

9 years ago2853: Merge branch 'master' into 2853-rendezvous
Tom Clegg [Thu, 13 Nov 2014 14:27:46 +0000 (09:27 -0500)]
2853: Merge branch 'master' into 2853-rendezvous

9 years agoMerge branch '4027-api-sdk-version-wip'
Brett Smith [Thu, 13 Nov 2014 13:56:33 +0000 (08:56 -0500)]
Merge branch '4027-api-sdk-version-wip'

Refs #4027.  Closes #4489.

9 years ago4027: Add arvados_sdk_version runtime constraint to API server.
Brett Smith [Tue, 11 Nov 2014 20:33:40 +0000 (15:33 -0500)]
4027: Add arvados_sdk_version runtime constraint to API server.

Crunch will use this information to provide a specific SDK version in
the runtime environment.

9 years ago3177: update test to select row in preview panel
radhika [Thu, 13 Nov 2014 02:49:59 +0000 (21:49 -0500)]
3177: update test to select row in preview panel

9 years agoMerge branch 'master' into 3177-collection-choose-files
radhika [Thu, 13 Nov 2014 02:19:35 +0000 (21:19 -0500)]
Merge branch 'master' into 3177-collection-choose-files

9 years ago3177: file selection
radhika [Thu, 13 Nov 2014 02:19:01 +0000 (21:19 -0500)]
3177: file selection

9 years ago2853: Use mock from KeepClientServiceTestCase for rendezvous tests
Tom Clegg [Wed, 12 Nov 2014 23:10:17 +0000 (18:10 -0500)]
2853: Use mock from KeepClientServiceTestCase for rendezvous tests
instead of intruding on KeepClient's private instance variables.

9 years agoUpdate arv-tag --help text in arv subcommands documentation.
Ward Vandewege [Wed, 12 Nov 2014 22:22:31 +0000 (17:22 -0500)]
Update arv-tag --help text in arv subcommands documentation.

refs #4486

9 years agoMake arv-tag print usage when --help is given. Also, fix typo in usage lines.
Ward Vandewege [Wed, 12 Nov 2014 22:20:31 +0000 (17:20 -0500)]
Make arv-tag print usage when --help is given. Also, fix typo in usage lines.

No issue #

9 years agoRemove some redundant lines from sdk/bin/arv
Ward Vandewege [Wed, 12 Nov 2014 22:19:39 +0000 (17:19 -0500)]
Remove some redundant lines from sdk/bin/arv

No issue #

9 years ago2853: Avoid using reserved word "hash" as a variable name.
Tom Clegg [Wed, 12 Nov 2014 21:54:36 +0000 (16:54 -0500)]
2853: Avoid using reserved word "hash" as a variable name.

9 years ago2853: Fix reference to reference set.
Tom Clegg [Wed, 12 Nov 2014 21:53:39 +0000 (16:53 -0500)]
2853: Fix reference to reference set.

9 years ago2853: Use Md5String() in getWeight().
Tom Clegg [Wed, 12 Nov 2014 21:53:00 +0000 (16:53 -0500)]
2853: Use Md5String() in getWeight().

9 years ago2853: Remove redundant test case.
Tom Clegg [Wed, 12 Nov 2014 21:52:21 +0000 (16:52 -0500)]
2853: Remove redundant test case.

9 years agoMerge branch '3609-run-command-bugfix'
Tim Pierce [Wed, 12 Nov 2014 21:35:31 +0000 (16:35 -0500)]
Merge branch '3609-run-command-bugfix'

Refs #3609.

9 years ago3609: fix "NameError: name 'rcode' is not defined"
Tim Pierce [Wed, 12 Nov 2014 21:07:15 +0000 (16:07 -0500)]
3609: fix "NameError: name 'rcode' is not defined"

If run-command raises an exception in the main 'try' loop before any
subprocesses have run, rcode will not be defined and "not any([status !=
0 for status in rcode.values()])" will raise a confusing "NameError:
name 'rcode' is not defined" exception.

Solution is to define rcode before the try/except block and to make sure
'success' is False if rcode is completely empty.

9 years agoMerge branch 'master' into 3177-collection-choose-files
radhika [Wed, 12 Nov 2014 20:47:27 +0000 (15:47 -0500)]
Merge branch 'master' into 3177-collection-choose-files

Conflicts:
apps/workbench/app/views/collections/_choose_rows.html.erb

9 years ago3177: in file chooser mode, allow row selection
radhika [Wed, 12 Nov 2014 20:35:23 +0000 (15:35 -0500)]
3177: in file chooser mode, allow row selection

9 years ago2853: Merge branch 'master' into 2853-rendezvous
Tom Clegg [Wed, 12 Nov 2014 18:59:59 +0000 (13:59 -0500)]
2853: Merge branch 'master' into 2853-rendezvous

Conflicts:
sdk/python/arvados/keep.py

9 years agoMerge branch '4380-node-manager-computenode-reorg-wip'
Brett Smith [Wed, 12 Nov 2014 18:59:14 +0000 (13:59 -0500)]
Merge branch '4380-node-manager-computenode-reorg-wip'

Refs #4380.  Closes #4496.

9 years ago4380: Reorganize arvnodeman.computenode.
Brett Smith [Tue, 11 Nov 2014 22:23:14 +0000 (17:23 -0500)]
4380: Reorganize arvnodeman.computenode.

This makes the hierarchy a little richer:

* arvnodeman.computenode.driver has all the cloud driver wrappers.
* arvnodeman.computenode.dispatch will be just like that, except it
  will consider local dispatch concerns.  For example, I'm going to
  add a SLURM submodule here to take care of draining.
* arvnodeman.computenode still has utility functions and
  ShutdownTimer.

9 years agoMerge branch '4434-collation' closes #4434
Tom Clegg [Wed, 12 Nov 2014 18:42:51 +0000 (13:42 -0500)]
Merge branch '4434-collation' closes #4434

9 years agoMerge branch '3400-workbench-all-items' closes #3400
Peter Amstutz [Wed, 12 Nov 2014 18:42:13 +0000 (13:42 -0500)]
Merge branch '3400-workbench-all-items' closes #3400

9 years agoMerge branch 'master' into 3400-workbench-all-items
Peter Amstutz [Wed, 12 Nov 2014 18:14:10 +0000 (13:14 -0500)]
Merge branch 'master' into 3400-workbench-all-items

9 years ago3400: test limit between server maxpagesize and 2x server maxpagesize.
Tom Clegg [Fri, 7 Nov 2014 03:52:44 +0000 (22:52 -0500)]
3400: test limit between server maxpagesize and 2x server maxpagesize.

Conflicts:
apps/workbench/test/unit/arvados_resource_list_test.rb

9 years agoMerge branch 'master' into 3177-collection-choose-files
radhika [Wed, 12 Nov 2014 17:39:08 +0000 (12:39 -0500)]
Merge branch 'master' into 3177-collection-choose-files

9 years agoBugfix bad exception name in PySDK util.is_hex.
Brett Smith [Wed, 12 Nov 2014 17:08:13 +0000 (12:08 -0500)]
Bugfix bad exception name in PySDK util.is_hex.

No issue #.

9 years ago3400: Stub out obsolete #links_for and remove result_links and related test.
Peter Amstutz [Wed, 12 Nov 2014 16:39:41 +0000 (11:39 -0500)]
3400: Stub out obsolete #links_for and remove result_links and related test.
Set @result_limit and @result_offset to nil unless @fetch_multiple_pages ==
false.  Add test for limit > default page size.

9 years agoMerge branch '3857-python-sdk-timeout-bugfix'
Tim Pierce [Wed, 12 Nov 2014 16:17:49 +0000 (11:17 -0500)]
Merge branch '3857-python-sdk-timeout-bugfix'

Fixes #3857.

9 years ago3857: fix python-requests dependency
Tim Pierce [Wed, 12 Nov 2014 16:13:36 +0000 (11:13 -0500)]
3857: fix python-requests dependency

Multiple timeout support in python-requests is only supported in
versions 2.4.0 or later.

9 years agoMerge branch '3603-pysdk-file-api-wip'
Brett Smith [Wed, 12 Nov 2014 14:57:44 +0000 (09:57 -0500)]
Merge branch '3603-pysdk-file-api-wip'

Refs #3603.  Closes #4316.

9 years ago3603: PySDK Collection objects support file-like APIs.
Brett Smith [Wed, 12 Nov 2014 14:42:17 +0000 (09:42 -0500)]
3603: PySDK Collection objects support file-like APIs.

This commit adds an open() method to CollectionReader and
CollectionWriter.  They mimic the built-in open(), returning objects
that implement as much as the Python file API as I can reasonably
manage.

There are a couple of backwards-incompatible changes to
StreamFileReader here:

* seek() now defaults to SEEK_CUR rather than SEEK_SET behavior.
* readlines() returns a list, and no longer supports decompression.

These changes bring the object closer to a file-like object.  We
reviewed our existing Python code, including known Crunch scripts from
users.  Nobody was using seek(), and nobody was obviously relying on
the decompression behavior of readlines().  So we believe this is
reasonably safe.

(Contrast name(), which lots of things are using, so we provide a
backward compatibility shim for it.)

9 years ago3603: Clean up PySDK imports.
Brett Smith [Wed, 12 Nov 2014 14:38:26 +0000 (09:38 -0500)]
3603: Clean up PySDK imports.

Sort; remove unused imports.

9 years ago3603: Fix context methods for PySDK Collection objects.
Brett Smith [Fri, 24 Oct 2014 15:23:09 +0000 (11:23 -0400)]
3603: Fix context methods for PySDK Collection objects.

9 years agoMerge branch 'master' into 3177-collection-choose-files
radhika [Wed, 12 Nov 2014 14:02:44 +0000 (09:02 -0500)]
Merge branch 'master' into 3177-collection-choose-files

9 years agoFix broken doc link.
Ward Vandewege [Wed, 12 Nov 2014 02:23:03 +0000 (21:23 -0500)]
Fix broken doc link.

refs #4486

9 years agoMerge branch '4486-document-arv'
Ward Vandewege [Wed, 12 Nov 2014 01:36:07 +0000 (20:36 -0500)]
Merge branch '4486-document-arv'

refs #4486

9 years agoRemove trailing whitespace.
Ward Vandewege [Wed, 12 Nov 2014 01:35:08 +0000 (20:35 -0500)]
Remove trailing whitespace.

refs #4486

9 years agoMerge branch 'master' into 4486-document-arv
Ward Vandewege [Wed, 12 Nov 2014 01:34:04 +0000 (20:34 -0500)]
Merge branch 'master' into 4486-document-arv

refs #4486

9 years agoAdd TCPKeepAlive and ServerAliveInterval ssh options to the .ssh/config
Ward Vandewege [Tue, 11 Nov 2014 22:21:24 +0000 (17:21 -0500)]
Add TCPKeepAlive and ServerAliveInterval ssh options to the .ssh/config
snippet that Workbench suggests.

no issue #

9 years agoAdd some basic documentation for the arv subcommands.
Ward Vandewege [Tue, 11 Nov 2014 21:53:02 +0000 (16:53 -0500)]
Add some basic documentation for the arv subcommands.

refs #4486

9 years ago2853: Remove shuffledServiceRoots() wrapper.
Tom Clegg [Tue, 11 Nov 2014 21:42:39 +0000 (16:42 -0500)]
2853: Remove shuffledServiceRoots() wrapper.

9 years agoMerge branch '4294-node-manager-min-nodes'
Tim Pierce [Tue, 11 Nov 2014 21:32:09 +0000 (16:32 -0500)]
Merge branch '4294-node-manager-min-nodes'

Fixes #4294.

9 years ago2853: Add comment.
Tom Clegg [Tue, 11 Nov 2014 21:30:58 +0000 (16:30 -0500)]
2853: Add comment.

9 years agoMerge branch '3857-python-sdk-timeouts'
Tim Pierce [Tue, 11 Nov 2014 21:30:04 +0000 (16:30 -0500)]
Merge branch '3857-python-sdk-timeouts'

Fixes #3857.

9 years ago3857: fixed comment
Tim Pierce [Tue, 11 Nov 2014 21:29:35 +0000 (16:29 -0500)]
3857: fixed comment

9 years ago2853: Use the same keep_service UUIDs so tests behave reliably.
Tom Clegg [Tue, 11 Nov 2014 21:20:12 +0000 (16:20 -0500)]
2853: Use the same keep_service UUIDs so tests behave reliably.

9 years ago4294: additional unit tests
Tim Pierce [Tue, 11 Nov 2014 20:59:23 +0000 (15:59 -0500)]
4294: additional unit tests

test_server_calc_returns_min_nodes_for_one_job
* Ensures that the @ServerCalculator@ still returns a wishlist with
_min_nodes_ when there is a job in the queue.

test_server_calc_more_jobs_than_min_nodes
* Tests that when the job queue has between _min_nodes_ and _max_nodes_ in
it, @ServerCalculator@ returns a wishlist exactly as long as the job
queue.

9 years ago4294: code review feedback
Tim Pierce [Tue, 11 Nov 2014 20:39:55 +0000 (15:39 -0500)]
4294: code review feedback

* Added min_nodes to sample config files
* Renamed idle_nodes to needed_nodes

9 years ago3857: fixed import order. d'oh
Tim Pierce [Tue, 11 Nov 2014 20:23:15 +0000 (15:23 -0500)]
3857: fixed import order. d'oh

9 years ago3857: code review feedback
Tim Pierce [Tue, 11 Nov 2014 16:04:19 +0000 (11:04 -0500)]
3857: code review feedback

* Set default timeouts to (20, 300) for proxies and (2, 300) for all
  else.
* KeepService:
** Removed unused 'timeout' argument to __init__()
** Trimmed unnecessary exceptions in last_status()
* Tests:
** test_collections.py: changed mock_api_call return value back to
   fake_httplib2_response
** Flattened test layers to eliminate KeepClientRetryGetTestMixin and
   KeepClientRetryPutTestMixin
** Moved proxy timeout tests to
   KeepClientServiceTestCase.test_proxy_get_request and
   .test_proxy_put_request
* Removed excess blank lines in docstrings

9 years ago2853: Update tests to survive ServiceRoots being a map[string]string.
Tom Clegg [Tue, 11 Nov 2014 20:02:07 +0000 (15:02 -0500)]
2853: Update tests to survive ServiceRoots being a map[string]string.

9 years ago2853: Add tests for reference set and some edge cases.
Tom Clegg [Tue, 11 Nov 2014 19:31:49 +0000 (14:31 -0500)]
2853: Add tests for reference set and some edge cases.

9 years ago2853: Add "reference set" test to check probe order agreement between implementations.
Tom Clegg [Tue, 11 Nov 2014 18:57:15 +0000 (13:57 -0500)]
2853: Add "reference set" test to check probe order agreement between implementations.

9 years ago2853: Fix instance ID in test fixture hostnames. Clean up brittle tests.
Tom Clegg [Tue, 11 Nov 2014 17:44:02 +0000 (12:44 -0500)]
2853: Fix instance ID in test fixture hostnames. Clean up brittle tests.

9 years ago2853: Use rendezvous hashing to select probe order in Python library.
Tom Clegg [Tue, 11 Nov 2014 17:11:08 +0000 (12:11 -0500)]
2853: Use rendezvous hashing to select probe order in Python library.

9 years ago2853: Use rendezvous hashing to select probe order.
Tom Clegg [Tue, 11 Nov 2014 10:14:21 +0000 (05:14 -0500)]
2853: Use rendezvous hashing to select probe order.

9 years ago4434: use select! instead of &= to preserve duplicates.
Tom Clegg [Mon, 10 Nov 2014 21:50:15 +0000 (16:50 -0500)]
4434: use select! instead of &= to preserve duplicates.

9 years ago4294: added min_nodes config parameter
Tim Pierce [Fri, 7 Nov 2014 14:37:24 +0000 (09:37 -0500)]
4294: added min_nodes config parameter

Added min_nodes configuration setting.  The job queue will return a
wishlist with at least min_nodes elements in it, and the node manager
daemon will avoid shutting down a node if it would bring the total below
min_nodes.

* arvnodeman.config sets default min_nodes to 0.
* NodeManagerDaemonActor:
** _nodes_wanted returns at least enough to keep the node count above
   min_nodes
** _nodes_excess will not allow the node count to drop below min_nodes
* jobqueue.ServerCalculator.servers_for_queue returns a list with at least
  min_nodes elements
* added test cases:
** NodeManagerDaemonActorTestCase.test_shutdown_declined_below_min_nodes
** ServerCalculatorTestCase.test_server_calc_returns_at_least_min_nodes

9 years agoExpand websocket config comments. refs #4233
Tom Clegg [Mon, 10 Nov 2014 18:18:20 +0000 (13:18 -0500)]
Expand websocket config comments. refs #4233

9 years agoMerge branch 'master' into 3177-collection-choose-files
radhika [Mon, 10 Nov 2014 16:32:31 +0000 (11:32 -0500)]
Merge branch 'master' into 3177-collection-choose-files

9 years agoExplicitly list the URL that get.arvados.org redirects to, for those
Ward Vandewege [Mon, 10 Nov 2014 15:16:52 +0000 (10:16 -0500)]
Explicitly list the URL that get.arvados.org redirects to, for those
folks who would like to read the install script before executing it.

No issue #

9 years agoPython run_test_server runs websockets separately non-SSL for compatibility
Peter Amstutz [Mon, 10 Nov 2014 15:03:04 +0000 (10:03 -0500)]
Python run_test_server runs websockets separately non-SSL for compatibility
with default application.yml.default.  refs #4084

9 years agoTweak uuid of test fixture so it doesn't match other tests unintentionally. refs...
Peter Amstutz [Fri, 7 Nov 2014 22:01:56 +0000 (17:01 -0500)]
Tweak uuid of test fixture so it doesn't match other tests unintentionally. refs #4084

9 years agoPySDK CollectionReader can get empty collection.
Brett Smith [Fri, 7 Nov 2014 21:00:53 +0000 (16:00 -0500)]
PySDK CollectionReader can get empty collection.

Fixing a regression from refs #3706.

9 years ago4434: Assume only that if a<b are lowercase ascii, aX<bY for any X, Y, collation.
Tom Clegg [Fri, 7 Nov 2014 20:55:15 +0000 (15:55 -0500)]
4434: Assume only that if a<b are lowercase ascii, aX<bY for any X, Y, collation.

9 years agoMerge branch '4084-log-pane-refresh' closes #4084
Peter Amstutz [Fri, 7 Nov 2014 20:50:22 +0000 (15:50 -0500)]
Merge branch '4084-log-pane-refresh' closes #4084

9 years ago3400: ArvadosResourceList retains api token that is active when it is created.
Peter Amstutz [Fri, 7 Nov 2014 20:48:22 +0000 (15:48 -0500)]
3400: ArvadosResourceList retains api token that is active when it is created.
Tweaked fetch-multiple-pages loop.  Made #each_page protected.  _paging sets
fetch_multiple_pages(false).

9 years ago4434: Merge branch 'master' into 4434-collation
Tom Clegg [Fri, 7 Nov 2014 20:41:40 +0000 (15:41 -0500)]
4434: Merge branch 'master' into 4434-collation

9 years ago3857: implement proxy_timeout
Tim Pierce [Fri, 7 Nov 2014 20:38:40 +0000 (15:38 -0500)]
3857: implement proxy_timeout

Add proxy_timeout argument to KeepClient.

Default timeouts are:
* timeout = (3, 30)
* proxy_timeout = (20, 60)

Added unit tests to check that KeepClient.get and KeepClient.put use the
default 'timeout' setting when talking directly to a Keep server, and
the 'proxy_timeout' setting when communicating with a proxy.

9 years ago4084: Add 'arv-log-refresh-control' div to job log pane. Log scrolling test tests...
Peter Amstutz [Fri, 7 Nov 2014 15:22:26 +0000 (10:22 -0500)]
4084: Add 'arv-log-refresh-control' div to job log pane.  Log scrolling test tests both pipeline_instance and job log panes.

9 years agoMerge branch '4334-idle-star-is-down' closes #4334
Peter Amstutz [Fri, 7 Nov 2014 14:28:59 +0000 (09:28 -0500)]
Merge branch '4334-idle-star-is-down' closes #4334

9 years agoMerge branch '4310-lock-before-fail' closes #4310 (again)
Peter Amstutz [Fri, 7 Nov 2014 14:28:45 +0000 (09:28 -0500)]
Merge branch '4310-lock-before-fail' closes #4310 (again)

9 years ago4310: Qualify namespace of AlreadyLockedError
Peter Amstutz [Fri, 7 Nov 2014 14:22:34 +0000 (09:22 -0500)]
4310: Qualify namespace of AlreadyLockedError

9 years ago4310: Lock job before changing its state to failed.
Peter Amstutz [Fri, 7 Nov 2014 13:53:55 +0000 (08:53 -0500)]
4310: Lock job before changing its state to failed.

9 years ago3400: Remove ArvadosResourceList#all
Tom Clegg [Fri, 7 Nov 2014 03:28:00 +0000 (22:28 -0500)]
3400: Remove ArvadosResourceList#all

9 years agoMerge branch 'master' into 3177-collection-choose-files
radhika [Fri, 7 Nov 2014 01:59:56 +0000 (20:59 -0500)]
Merge branch 'master' into 3177-collection-choose-files

9 years agoMerge branch '4314-crunch-token-expire' refs #4314 refs #4310
Peter Amstutz [Thu, 6 Nov 2014 22:02:34 +0000 (17:02 -0500)]
Merge branch '4314-crunch-token-expire' refs #4314 refs #4310

9 years ago4314: Don't expire the token if the job is still in queued state.
Peter Amstutz [Thu, 6 Nov 2014 21:51:40 +0000 (16:51 -0500)]
4314: Don't expire the token if the job is still in queued state.

9 years agoMerge branch '4408-collection-sharing-login-fix-wip'
Brett Smith [Thu, 6 Nov 2014 20:49:32 +0000 (15:49 -0500)]
Merge branch '4408-collection-sharing-login-fix-wip'

Closes #4408.

9 years ago4408: Workbench Collection sharing allows file downloads again.
Brett Smith [Thu, 6 Nov 2014 16:59:00 +0000 (11:59 -0500)]
4408: Workbench Collection sharing allows file downloads again.

Earlier we refactored our API token loading code to load User.current
to check that it was valid.  This approach doesn't work when we're
presenting shared Collections, because the token usually won't be
scoped to get user information.  Skip the check for this specific
case.

9 years ago4334: Convert "idle*" state to "down"
Peter Amstutz [Thu, 6 Nov 2014 19:22:40 +0000 (14:22 -0500)]
4334: Convert "idle*" state to "down"

9 years agoMerge branch '4088-collection-show-files-filter'
Tim Pierce [Thu, 6 Nov 2014 19:14:35 +0000 (14:14 -0500)]
Merge branch '4088-collection-show-files-filter'

Fixes #4088.

9 years agoGo to next job after fail_job when there is a tag mismatch. refs #4310
Peter Amstutz [Thu, 6 Nov 2014 18:56:18 +0000 (13:56 -0500)]
Go to next job after fail_job when there is a tag mismatch.  refs #4310

9 years agoMerge branch '4310-git-tag-race' closes #4310
Peter Amstutz [Thu, 6 Nov 2014 18:18:03 +0000 (13:18 -0500)]
Merge branch '4310-git-tag-race' closes #4310

9 years ago4310: Remove stderr redirect from git rev-list, add it to git tag. Prefix log
Peter Amstutz [Thu, 6 Nov 2014 18:11:09 +0000 (13:11 -0500)]
4310: Remove stderr redirect from git rev-list, add it to git tag.  Prefix log
output with "dispatch: ".  Tweak error message if rev-list fails.

9 years agoMerge branch '4383-easy-install'
Ward Vandewege [Thu, 6 Nov 2014 18:00:46 +0000 (13:00 -0500)]
Merge branch '4383-easy-install'

refs #4383

9 years agoMerge branch 'master' into 4383-easy-install
Ward Vandewege [Thu, 6 Nov 2014 18:00:22 +0000 (13:00 -0500)]
Merge branch 'master' into 4383-easy-install

refs #4383

9 years agoAnother documentation tweak based on review feedback.
Ward Vandewege [Thu, 6 Nov 2014 17:59:39 +0000 (12:59 -0500)]
Another documentation tweak based on review feedback.

closes #4383

9 years agoMerge branch 'master' into 3177-collection-choose-files
radhika [Thu, 6 Nov 2014 17:10:45 +0000 (12:10 -0500)]
Merge branch 'master' into 3177-collection-choose-files

9 years ago3177: String != 'String'
radhika [Thu, 6 Nov 2014 17:05:30 +0000 (12:05 -0500)]
3177: String != 'String'

9 years ago4310: Fix race condition between testing for tag and setting tag by reversing
Peter Amstutz [Thu, 6 Nov 2014 16:37:49 +0000 (11:37 -0500)]
4310: Fix race condition between testing for tag and setting tag by reversing
order of operations: try to set the tag, and only test for it if there is an
error.

9 years agoMerge branch '4389-breadcrumbs-infinite-loop' closes #4389
Tom Clegg [Thu, 6 Nov 2014 16:33:07 +0000 (11:33 -0500)]
Merge branch '4389-breadcrumbs-infinite-loop' closes #4389