arvados.git
7 years ago10846: Revise shutdown behavior.
Peter Amstutz [Thu, 2 Feb 2017 14:41:30 +0000 (09:41 -0500)]
10846: Revise shutdown behavior.

* Remove node blacklisting.  Because of arvados node record reuse and assigning
  compute node ids based on record uuid, it was possible to boot a new node
  with the same id as a previously blacklisted node.  Previously blacklisted
  'broken' nodes are now considered 'down' when determining if it is necessary
  to bring up new nodes.

* Failure to destroy a node is no longer retried by the shutdown actor.  A
  failure cancels the shutdown.  The daemon is expected to schedule a new
  shutdown attempt.

* Restored the concept of "cancellable" shutdown, which checks if the node is
  still shutdown eligible before actually making the call to shut it down.

* Adjusted mocking behavior to fix tests which were producing suppressed
  errors (visible in debug logging but not failing the test) when node sizes
  were inconsistent between the wishlist, cloud_node objects, and
  ServerCalculator.

7 years ago10846: Remove duplicate log message suppression by ComputeNodeMonitorActor
Peter Amstutz [Wed, 1 Feb 2017 17:40:12 +0000 (12:40 -0500)]
10846: Remove duplicate log message suppression by ComputeNodeMonitorActor

7 years agoMerge branch '10705-dedup-log-message'
Tom Clegg [Wed, 1 Feb 2017 16:46:26 +0000 (11:46 -0500)]
Merge branch '10705-dedup-log-message'

refs #10705

7 years ago10705: Fix double-logged error.
Tom Clegg [Wed, 1 Feb 2017 16:38:29 +0000 (11:38 -0500)]
10705: Fix double-logged error.

7 years agoMerge branch '10700-dispatch'
Tom Clegg [Tue, 31 Jan 2017 21:32:05 +0000 (16:32 -0500)]
Merge branch '10700-dispatch'

closes #10700
  refs #10701
closes #10702
closes #10703
closes #10704

Conflicts:
services/crunch-dispatch-slurm/crunch-dispatch-slurm.go

7 years agoMerge branch '10694-provenance-graph-consistency'
Lucas Di Pentima [Tue, 31 Jan 2017 17:27:03 +0000 (14:27 -0300)]
Merge branch '10694-provenance-graph-consistency'
Closes #10694

7 years agoMerge branch '10868-ip-addr-conflict'
Tom Clegg [Tue, 31 Jan 2017 15:52:29 +0000 (10:52 -0500)]
Merge branch '10868-ip-addr-conflict'

refs #10868

7 years agoMerge branch '10813-arv-put-six-threads'
Lucas Di Pentima [Tue, 31 Jan 2017 15:13:33 +0000 (12:13 -0300)]
Merge branch '10813-arv-put-six-threads'
Closes #10813

7 years ago10700: Rename squeue identifiers (sqCheck = SqueueChecker{})
Tom Clegg [Tue, 31 Jan 2017 00:19:49 +0000 (19:19 -0500)]
10700: Rename squeue identifiers (sqCheck = SqueueChecker{})

7 years ago10700: Simplify squeue checker.
Tom Clegg [Mon, 30 Jan 2017 23:32:49 +0000 (18:32 -0500)]
10700: Simplify squeue checker.

7 years ago10813: Merge branch 'master' into 10813-arv-put-six-threads
Lucas Di Pentima [Mon, 30 Jan 2017 21:29:10 +0000 (18:29 -0300)]
10813: Merge branch 'master' into 10813-arv-put-six-threads

7 years ago10813: Added only_committed argument to ArvFile.manifest_text() method to maintain...
Lucas Di Pentima [Mon, 30 Jan 2017 21:26:35 +0000 (18:26 -0300)]
10813: Added only_committed argument to ArvFile.manifest_text() method to maintain consistency with its counterpart from Collection class.

7 years ago10813: Removed unnecessary argument
Lucas Di Pentima [Mon, 30 Jan 2017 21:25:34 +0000 (18:25 -0300)]
10813: Removed unnecessary argument

7 years ago10868: Remove old DNS entry immediately when a new node re-uses an old node's IP...
Tom Clegg [Mon, 30 Jan 2017 20:17:52 +0000 (15:17 -0500)]
10868: Remove old DNS entry immediately when a new node re-uses an old node's IP address.

7 years ago10694: Flipped graph orientations so they are all (collections, jobs, pipelines)...
Lucas Di Pentima [Mon, 30 Jan 2017 19:39:02 +0000 (16:39 -0300)]
10694: Flipped graph orientations so they are all (collections, jobs, pipelines) redered top-down.

7 years ago10694: Changed Pipeline Instance's Graph orientation to match Collections and Jobs.
Lucas Di Pentima [Mon, 30 Jan 2017 18:31:16 +0000 (15:31 -0300)]
10694: Changed Pipeline Instance's Graph orientation to match Collections and Jobs.

7 years ago10694: Changed the Provenance Graph orientation of Jobs to be the same way as it...
Lucas Di Pentima [Mon, 30 Jan 2017 18:05:33 +0000 (15:05 -0300)]
10694: Changed the Provenance Graph orientation of Jobs to be the same way as it is rendered on Collections.

7 years ago10700: Rephrase "should cancel" condition to be less unclear.
Tom Clegg [Mon, 30 Jan 2017 16:33:28 +0000 (11:33 -0500)]
10700: Rephrase "should cancel" condition to be less unclear.

7 years agoMerge branch '10690-config-dump'
Tom Clegg [Mon, 30 Jan 2017 15:31:34 +0000 (10:31 -0500)]
Merge branch '10690-config-dump'

closes #10690

7 years ago10690: Fix conflicting uses of "config" name.
Tom Clegg [Fri, 27 Jan 2017 21:46:51 +0000 (16:46 -0500)]
10690: Fix conflicting uses of "config" name.

7 years ago10690: Fix missing return after exit().
Tom Clegg [Fri, 27 Jan 2017 20:45:27 +0000 (15:45 -0500)]
10690: Fix missing return after exit().

7 years ago10690: De-duplicate dumpConfig.
Tom Clegg [Fri, 27 Jan 2017 20:28:36 +0000 (15:28 -0500)]
10690: De-duplicate dumpConfig.

7 years ago10690: Add -dump-config to arv-git-httpd, crunch-dispatch-slurm, keep-balance, keep...
Tom Clegg [Thu, 12 Jan 2017 15:33:16 +0000 (10:33 -0500)]
10690: Add -dump-config to arv-git-httpd, crunch-dispatch-slurm, keep-balance, keep-web, keepproxy.

7 years agoDoc update: add trademark symbol next to the word 'Arvados' in 2 places.
Ward Vandewege [Fri, 27 Jan 2017 19:05:21 +0000 (14:05 -0500)]
Doc update: add trademark symbol next to the word 'Arvados' in 2 places.

No issue #

7 years agoMerge branch '10990-keep-web-ranges'
Tom Clegg [Fri, 27 Jan 2017 18:30:33 +0000 (13:30 -0500)]
Merge branch '10990-keep-web-ranges'

refs #10990

7 years ago10990: Remove superfluous code for headers now handled by http.ServeContent.
Tom Clegg [Fri, 27 Jan 2017 07:27:23 +0000 (02:27 -0500)]
10990: Remove superfluous code for headers now handled by http.ServeContent.

7 years ago10990: Adjust readahead to work better on small segments. Improve comments.
Tom Clegg [Fri, 27 Jan 2017 07:10:46 +0000 (02:10 -0500)]
10990: Adjust readahead to work better on small segments. Improve comments.

7 years ago10990: Fix collectionreader tests.
Tom Clegg [Fri, 27 Jan 2017 03:46:06 +0000 (22:46 -0500)]
10990: Fix collectionreader tests.

7 years ago10990: Support Range headers with non-zero start offset.
Tom Clegg [Fri, 27 Jan 2017 03:23:22 +0000 (22:23 -0500)]
10990: Support Range headers with non-zero start offset.

7 years ago10990: Add tests for byte range requests that start at byte >0.
Tom Clegg [Thu, 26 Jan 2017 22:40:04 +0000 (17:40 -0500)]
10990: Add tests for byte range requests that start at byte >0.

7 years agoMerge branch '10980-add-ubuntu1604-support'
Ward Vandewege [Thu, 26 Jan 2017 22:38:27 +0000 (17:38 -0500)]
Merge branch '10980-add-ubuntu1604-support'

refs #10980

7 years agoAdd support for Ubuntu 1604 ("xenial") to our build scripts.
Ward Vandewege [Thu, 26 Jan 2017 22:30:58 +0000 (17:30 -0500)]
Add support for Ubuntu 1604 ("xenial") to our build scripts.

refs #10980

7 years agoRemove old debian7 package testing file.
Ward Vandewege [Thu, 26 Jan 2017 22:24:10 +0000 (17:24 -0500)]
Remove old debian7 package testing file.

refs #10785

7 years agoRemove deprecated --force-yes flag during package testing, replace with
Ward Vandewege [Thu, 26 Jan 2017 22:23:04 +0000 (17:23 -0500)]
Remove deprecated --force-yes flag during package testing, replace with
--allow-unauthorized

refs #10980

7 years ago10700: Rename PollInterval to PollPeriod in library to match commands and config...
Tom Clegg [Thu, 26 Jan 2017 19:40:30 +0000 (14:40 -0500)]
10700: Rename PollInterval to PollPeriod in library to match commands and config files.

7 years ago10704: Rate-limit startup attempts per container.
Tom Clegg [Thu, 26 Jan 2017 19:37:54 +0000 (14:37 -0500)]
10704: Rate-limit startup attempts per container.

7 years agoBump schema-salad version for schema loading performance fix. no issue #
Peter Amstutz [Thu, 26 Jan 2017 16:10:00 +0000 (11:10 -0500)]
Bump schema-salad version for schema loading performance fix.  no issue #

7 years ago10703: Un-pyramid run().
Tom Clegg [Wed, 25 Jan 2017 21:37:26 +0000 (16:37 -0500)]
10703: Un-pyramid run().

7 years ago10701: Remove unneeded complexity in squeue invocation.
Tom Clegg [Wed, 25 Jan 2017 21:04:30 +0000 (16:04 -0500)]
10701: Remove unneeded complexity in squeue invocation.

7 years agoarv_docker_get_image should not modify dockerRequirement parameter. refs #10812
Peter Amstutz [Wed, 25 Jan 2017 19:31:52 +0000 (14:31 -0500)]
arv_docker_get_image should not modify dockerRequirement parameter.  refs #10812

7 years agoMerge branch '10812-docker-upload-fix' refs #10812
Peter Amstutz [Wed, 25 Jan 2017 18:51:58 +0000 (13:51 -0500)]
Merge branch '10812-docker-upload-fix' refs #10812

7 years ago10812: Fix bug and add test that docker dependencies are found and uploaded.
Peter Amstutz [Wed, 25 Jan 2017 18:20:28 +0000 (13:20 -0500)]
10812: Fix bug and add test that docker dependencies are found and uploaded.

7 years ago10703: Do not catch signals in crunch-dispatch-slurm. Simplify "stop dispatcher loop...
Tom Clegg [Wed, 25 Jan 2017 15:59:48 +0000 (10:59 -0500)]
10703: Do not catch signals in crunch-dispatch-slurm. Simplify "stop dispatcher loop" API.

7 years agoMerge branch '10895-run-in-single-container-reuse' refs #10895
Peter Amstutz [Wed, 25 Jan 2017 15:09:19 +0000 (10:09 -0500)]
Merge branch '10895-run-in-single-container-reuse' refs #10895

7 years ago10895: Don't report "reused" for Failed/Cancelled containers. Tweak log
Peter Amstutz [Wed, 25 Jan 2017 14:53:13 +0000 (09:53 -0500)]
10895: Don't report "reused" for Failed/Cancelled containers.  Tweak log
message.  Tweak behavior of --debug to also enable arvados SDK debugging.

7 years agoMerge branch '9998-no-count-items-available'
Tom Clegg [Tue, 24 Jan 2017 20:28:37 +0000 (15:28 -0500)]
Merge branch '9998-no-count-items-available'

closes #9998

7 years ago9998: Update CLI usage.
Tom Clegg [Tue, 24 Jan 2017 20:28:04 +0000 (15:28 -0500)]
9998: Update CLI usage.

7 years ago9998: Remove superfluous word.
Tom Clegg [Tue, 24 Jan 2017 20:18:52 +0000 (15:18 -0500)]
9998: Remove superfluous word.

7 years agoMerge branch '10868-job-log-node-info'
Tom Clegg [Tue, 24 Jan 2017 20:17:00 +0000 (15:17 -0500)]
Merge branch '10868-job-log-node-info'

refs #10868

7 years ago9998: Use links instead of specimens to test count param.
Tom Clegg [Tue, 24 Jan 2017 18:51:40 +0000 (13:51 -0500)]
9998: Use links instead of specimens to test count param.

7 years ago9998: Update API docs.
Tom Clegg [Tue, 24 Jan 2017 18:42:30 +0000 (13:42 -0500)]
9998: Update API docs.

7 years ago10868: Include node UUIDs and properties in job logs.
Tom Clegg [Tue, 24 Jan 2017 03:47:57 +0000 (22:47 -0500)]
10868: Include node UUIDs and properties in job logs.

7 years ago10895: Don't add uploaded files to pathmap if they are not referenced.
Peter Amstutz [Mon, 23 Jan 2017 22:03:30 +0000 (17:03 -0500)]
10895: Don't add uploaded files to pathmap if they are not referenced.

7 years ago10895: Improve reuse for RunInSingleContainer jobs
Peter Amstutz [Mon, 23 Jan 2017 21:21:24 +0000 (16:21 -0500)]
10895: Improve reuse for RunInSingleContainer jobs

* Consolodate and de-duplicate requirements and hints
* Use json.dumps() with sorted_keys=True to avoid issues with round trip YAML
  formatting and comments that are irrelevant to reuse semantics.
* Remember subworkflow packing for more efficient scattering.
* Logging distinguishes when jobs and containers are reused.

7 years ago9998: Handle timestamp collisions in collection index.
Tom Clegg [Mon, 23 Jan 2017 20:31:23 +0000 (15:31 -0500)]
9998: Handle timestamp collisions in collection index.

7 years agoMerge branch 'master' into 9998-no-count-items-available
Tom Clegg [Mon, 23 Jan 2017 15:41:24 +0000 (10:41 -0500)]
Merge branch 'master' into 9998-no-count-items-available

7 years agoMerge branch '10812-cwl-separate-dependencies' refs #10812
Peter Amstutz [Mon, 23 Jan 2017 15:32:05 +0000 (10:32 -0500)]
Merge branch '10812-cwl-separate-dependencies' refs #10812

7 years ago10812: Handle expected NotFoundError error when checking if file exists in keep.
Peter Amstutz [Mon, 23 Jan 2017 15:20:46 +0000 (10:20 -0500)]
10812: Handle expected NotFoundError error when checking if file exists in keep.

7 years ago10812: Add num_retries to CollectionFetcher and collectionResolver.
Peter Amstutz [Mon, 23 Jan 2017 14:52:34 +0000 (09:52 -0500)]
10812: Add num_retries to CollectionFetcher and collectionResolver.

7 years ago10812: Fix indentation typo.
Peter Amstutz [Fri, 20 Jan 2017 16:36:05 +0000 (11:36 -0500)]
10812: Fix indentation typo.

7 years ago10812: Update cwltool and schema-salad dependencies.
Peter Amstutz [Thu, 19 Jan 2017 18:29:11 +0000 (13:29 -0500)]
10812: Update cwltool and schema-salad dependencies.

7 years ago10812: Handle $schema references.
Peter Amstutz [Wed, 18 Jan 2017 22:46:54 +0000 (17:46 -0500)]
10812: Handle $schema references.

7 years ago10812: Don't use cStringIO which doesn't like unicode strings.
Peter Amstutz [Wed, 18 Jan 2017 16:47:07 +0000 (11:47 -0500)]
10812: Don't use cStringIO which doesn't like unicode strings.

7 years ago10812: Check for dockerOutputDirectory and raise UnsupportedRequirement up front.
Peter Amstutz [Mon, 16 Jan 2017 15:51:10 +0000 (10:51 -0500)]
10812: Check for dockerOutputDirectory and raise UnsupportedRequirement up front.

7 years ago10812: Fix imports, reference #main in cwl:tool
Peter Amstutz [Mon, 16 Jan 2017 15:22:30 +0000 (10:22 -0500)]
10812: Fix imports, reference #main in cwl:tool

7 years ago10812: Improve check that already packed workflow collection exists with same
Peter Amstutz [Wed, 11 Jan 2017 21:33:11 +0000 (16:33 -0500)]
10812: Improve check that already packed workflow collection exists with same
PDH and similar name.  Don't crash when registering pipeline template that has
array inputs.

7 years ago10812: Don't try to upload embedded tools separately unless they have an
Peter Amstutz [Wed, 11 Jan 2017 20:51:54 +0000 (15:51 -0500)]
10812: Don't try to upload embedded tools separately unless they have an
identifier.

7 years ago10812: Handle workflow keep references.
Peter Amstutz [Wed, 11 Jan 2017 13:41:08 +0000 (08:41 -0500)]
10812: Handle workflow keep references.

7 years ago10812: Use packed workflows for all run modes.
Peter Amstutz [Mon, 23 Jan 2017 15:31:08 +0000 (10:31 -0500)]
10812: Use packed workflows for all run modes.

Conflicts:
sdk/cwl/arvados_cwl/__init__.py
sdk/cwl/arvados_cwl/runner.py

7 years agoMerge branch '10812-log-merge' refs #10812
Peter Amstutz [Mon, 23 Jan 2017 15:29:01 +0000 (10:29 -0500)]
Merge branch '10812-log-merge' refs #10812

7 years agoMerge branch '10812-submit-runner-image' refs #10812
Peter Amstutz [Mon, 23 Jan 2017 15:28:39 +0000 (10:28 -0500)]
Merge branch '10812-submit-runner-image' refs #10812

7 years agoMerge branch '10935-noop-munge' closes #10935
Peter Amstutz [Mon, 23 Jan 2017 15:28:06 +0000 (10:28 -0500)]
Merge branch '10935-noop-munge' closes #10935

7 years ago10812: Add tests
Peter Amstutz [Fri, 20 Jan 2017 17:25:51 +0000 (12:25 -0500)]
10812: Add tests

7 years ago10812: Perform merge of logs based on timestamp instead of sorting log lines.
Peter Amstutz [Thu, 12 Jan 2017 22:05:23 +0000 (17:05 -0500)]
10812: Perform merge of logs based on timestamp instead of sorting log lines.

7 years ago10935: Add test that round tripping works after disabling deep_munge.
Peter Amstutz [Fri, 20 Jan 2017 16:21:50 +0000 (11:21 -0500)]
10935: Add test that round tripping works after disabling deep_munge.

7 years ago10812: Add --submit-runner-image to override default Docker image when submitting...
Peter Amstutz [Fri, 20 Jan 2017 14:46:50 +0000 (09:46 -0500)]
10812: Add --submit-runner-image to override default Docker image when submitting workflow runner.

Conflicts:
sdk/cwl/arvados_cwl/__init__.py
sdk/cwl/arvados_cwl/runner.py

7 years agoMerge branch 'master' into 9998-no-count-items-available
Tom Clegg [Thu, 19 Jan 2017 20:51:18 +0000 (15:51 -0500)]
Merge branch 'master' into 9998-no-count-items-available

7 years ago9998: Change count=true/false to exact/none. Add tests.
Tom Clegg [Thu, 19 Jan 2017 20:50:55 +0000 (15:50 -0500)]
9998: Change count=true/false to exact/none. Add tests.

7 years ago10935: Make Rails method deep_munge a noop, so that empty arrays can round trip
Peter Amstutz [Thu, 19 Jan 2017 19:45:39 +0000 (14:45 -0500)]
10935: Make Rails method deep_munge a noop, so that empty arrays can round trip
through json instead of being turned into 'nil'.

7 years ago10813: Merge branch 'master' into 10813-arv-put-six-threads
Lucas Di Pentima [Wed, 18 Jan 2017 20:14:01 +0000 (17:14 -0300)]
10813: Merge branch 'master' into 10813-arv-put-six-threads

7 years ago10813: Fixed typo on argument documentation.
Lucas Di Pentima [Wed, 18 Jan 2017 16:29:46 +0000 (13:29 -0300)]
10813: Fixed typo on argument documentation.
Added only_committed parameter to Collection.manifest_text() so it passes along to _get_manifest_text().
Corrected put_queue's size back to 2 on BlockManager.

7 years agoMerge branch '10292-cwl-deadlock' refs #10292
Peter Amstutz [Wed, 18 Jan 2017 15:04:33 +0000 (10:04 -0500)]
Merge branch '10292-cwl-deadlock' refs #10292

7 years ago10292: Update cwltool for bugfix: intermittant workflow deadlock on subworkflow compl...
Peter Amstutz [Wed, 18 Jan 2017 14:57:25 +0000 (09:57 -0500)]
10292: Update cwltool for bugfix: intermittant workflow deadlock on subworkflow completion.

7 years ago10813: Bug fixed on BlockManager's _get_manifest_text() when asked for only include...
Lucas Di Pentima [Wed, 18 Jan 2017 14:14:59 +0000 (11:14 -0300)]
10813: Bug fixed on BlockManager's _get_manifest_text() when asked for only include committed blocks on collections with subcollections inside it.
Also, added --threads parameter to arv-put command so the default number of upload threads (2) can be overridden.
Changed the update thread to execute once every minute, because it blocks the local collection for a few seconds (depending on the manifest size)
Also, cleaned up some locking uses on the update thread to minimize the time with the locking in place.

7 years agoRemove references to debian7 and centos6. Also remove some hardcoded
Ward Vandewege [Wed, 18 Jan 2017 03:26:04 +0000 (22:26 -0500)]
Remove references to debian7 and centos6. Also remove some hardcoded
--iteration flags for fpm, now that #6885 is done.

refs #10785

7 years agoMerge branch '10858-build-packages-improvements'
Ward Vandewege [Wed, 18 Jan 2017 02:54:58 +0000 (21:54 -0500)]
Merge branch '10858-build-packages-improvements'

closes #10858

7 years ago10858: Equivalent commit for 10881: Add python-futures as explicit
Ward Vandewege [Wed, 18 Jan 2017 02:35:54 +0000 (21:35 -0500)]
10858: Equivalent commit for 10881: Add python-futures as explicit
cwltest dependency and bump iteration.

refs #10858

7 years agoFix rpm architecture in the test_package_presence function. Expand on
Ward Vandewege [Wed, 18 Jan 2017 02:34:34 +0000 (21:34 -0500)]
Fix rpm architecture in the test_package_presence function. Expand on
comment.

refs #10858

7 years agoMerge branch '10800-update-doc'
Ward Vandewege [Wed, 18 Jan 2017 01:47:56 +0000 (20:47 -0500)]
Merge branch '10800-update-doc'

closes #10800

7 years agoMerge branch 'master' into 10800-update-doc
Ward Vandewege [Wed, 18 Jan 2017 01:46:44 +0000 (20:46 -0500)]
Merge branch 'master' into 10800-update-doc

refs #10800

7 years agoMore documentation updates to reflect the end of support for Debian
Ward Vandewege [Wed, 18 Jan 2017 01:43:07 +0000 (20:43 -0500)]
More documentation updates to reflect the end of support for Debian
Wheezy and CentOS 6. Also remove obsolete arv-docker installation page,
which was no longer linked from anywhere.

refs #10800

7 years agoDocumentation updates to reflect the end of support for Debian Wheezy and CentOS 6.
Ward Vandewege [Tue, 17 Jan 2017 18:01:00 +0000 (13:01 -0500)]
Documentation updates to reflect the end of support for Debian Wheezy and CentOS 6.

refs #10800

7 years agoMerge branch '10868-log-dispatch-decisions'
Tom Clegg [Tue, 17 Jan 2017 16:01:42 +0000 (11:01 -0500)]
Merge branch '10868-log-dispatch-decisions'

refs #10868

7 years ago10868: Add fake uuid to test case for more realistic log messages.
Tom Clegg [Mon, 16 Jan 2017 21:53:16 +0000 (16:53 -0500)]
10868: Add fake uuid to test case for more realistic log messages.

7 years ago10868: Log job runtime constraints and node properties when making a dispatch decision.
Tom Clegg [Mon, 16 Jan 2017 21:38:29 +0000 (16:38 -0500)]
10868: Log job runtime constraints and node properties when making a dispatch decision.

7 years agoBump libcloud pin to 0.20.2.dev3 for Azure China support. refs #10833
Peter Amstutz [Mon, 16 Jan 2017 18:11:19 +0000 (13:11 -0500)]
Bump libcloud pin to 0.20.2.dev3 for Azure China support.  refs #10833

7 years agoMerge branch 'master' into 9998-no-count-items-available
Tom Clegg [Mon, 16 Jan 2017 16:13:32 +0000 (11:13 -0500)]
Merge branch 'master' into 9998-no-count-items-available

Conflicts:
sdk/go/arvados/resource_list.go
services/keep-balance/collection.go

7 years agoIf the fpm run fails, always print out the failed command so that we
Ward Vandewege [Sat, 14 Jan 2017 14:57:35 +0000 (09:57 -0500)]
If the fpm run fails, always print out the failed command so that we
don't have to run the build scripts in debug mode all the time.

refs #10858

7 years agoFix the shortcut that tests the need of rebuilding the arvados-src
Ward Vandewege [Sat, 14 Jan 2017 14:56:53 +0000 (09:56 -0500)]
Fix the shortcut that tests the need of rebuilding the arvados-src
package.

refs #10858

7 years agoHandle rpm-based backports correctly.
Ward Vandewege [Sat, 14 Jan 2017 03:54:34 +0000 (22:54 -0500)]
Handle rpm-based backports correctly.

refs #10858