[ARVADOS] updated: 773a1afc99af74e8bb7c81cbbc9cb785d4f7920a

[Git user]

Summary of changes:
 services/api/app/models/job.rb     |  2 +-
 services/api/config/application.rb |  6 ++++--
 services/api/test/unit/job_test.rb | 18 ++++++++++++++++++
 3 files changed, 23 insertions(+), 3 deletions(-)

       via  773a1afc99af74e8bb7c81cbbc9cb785d4f7920a (commit)
       via  364c520d4d47a5edcf6f0e79e42757477b51d33d (commit)
       via  4a00ceae73e8d76affe6b646832c525355e7897c (commit)
      from  3b1150386e2fd3513b98deca05ebd4a248ce3471 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 773a1afc99af74e8bb7c81cbbc9cb785d4f7920a
Merge: 3b11503 364c520
Author: Tom Clegg <tom at curoverse.com>
Date:   Thu Jan 5 12:42:22 2017 -0500

    Merge branch '10808-admin-cancel-job'
    
    refs #10808


commit 364c520d4d47a5edcf6f0e79e42757477b51d33d
Author: Tom Clegg <tom at curoverse.com>
Date:   Thu Jan 5 12:42:04 2017 -0500

    10808: Move comment.

diff --git a/services/api/config/application.rb b/services/api/config/application.rb
index e7002dd..d3fee8e 100644
--- a/services/api/config/application.rb
+++ b/services/api/config/application.rb
@@ -36,10 +36,12 @@ module Server
 
     I18n.enforce_available_locales = false
 
+    # Before using the filesystem backend for Rails.cache, check
+    # whether we own the relevant directory. If we don't, using it is
+    # likely to either fail or (if we're root) pollute it and cause
+    # other processes to fail later.
     default_cache_path = Rails.root.join('tmp', 'cache')
     if not File.owned?(default_cache_path)
-      # If we don't own the cache dir, using it will either fail or
-      # (if we're root) pollute it so other processes fail later.
       STDERR.puts("Defaulting to memory cache, because #{default_cache_path} " \
                   "owner (uid=#{File::Stat.new(default_cache_path).uid}) " \
                   "is not me (uid=#{Process.euid})")

-----------------------------------------------------------------------


hooks/post-receive
--