[ARVADOS] updated: a6d5c9b5a512e7c4b04e7f73fe2777bd81277602

[Git user]

Summary of changes:
 .../app/views/trash_items/_show_recent_trash.html.erb      | 12 ++++++------
 .../app/views/trash_items/_show_trash_rows.html.erb        | 14 +++++++++++---
 apps/workbench/test/integration/trash_test.rb              | 13 ++++++++++++-
 3 files changed, 29 insertions(+), 10 deletions(-)

       via  a6d5c9b5a512e7c4b04e7f73fe2777bd81277602 (commit)
       via  e596f2e3d8d782fad59b514853419420db45fdac (commit)
       via  6249668bc01ec7561503f2e7de7063f25ac7ba56 (commit)
       via  0923fecbf907d2aaa7f35775eba9ecd947eed098 (commit)
       via  36c50d4695f05ac40109ed6e8358291081c5b9f7 (commit)
       via  6ac4615d13060a19d8cafbe35b67838e8ead33b0 (commit)
       via  777466ea9bfebd7d1be2ce9d90515244f9f1a7fb (commit)
       via  a68773416fa1bb1a6724f6e5b020b3a900eecd26 (commit)
      from  349e4b5e547d26ed9b1489db74fa38a8b00a8f75 (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 a6d5c9b5a512e7c4b04e7f73fe2777bd81277602
Merge: 349e4b5 e596f2e
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Mon Sep 18 14:25:25 2017 -0400

    Merge branch '12197-show-pdh-in-trash'
    
    closes #12197
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>


commit e596f2e3d8d782fad59b514853419420db45fdac
Merge: 6249668 349e4b5
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Mon Sep 18 14:24:48 2017 -0400

    Merge branch 'master' into 12197-show-pdh-in-trash
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>


commit 6249668bc01ec7561503f2e7de7063f25ac7ba56
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Mon Sep 18 14:10:40 2017 -0400

    12197: Update PDH column label for consistency.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

diff --git a/apps/workbench/app/views/trash_items/_show_recent_trash.html.erb b/apps/workbench/app/views/trash_items/_show_recent_trash.html.erb
index 3cdb23e..c534e52 100644
--- a/apps/workbench/app/views/trash_items/_show_recent_trash.html.erb
+++ b/apps/workbench/app/views/trash_items/_show_recent_trash.html.erb
@@ -44,7 +44,7 @@ SPDX-License-Identifier: AGPL-3.0 %>
           <th>Name</th>
           <th>Date trashed /<br />to be deleted</th>
           <th>Owner</th>
-          <th>UUID /<br />portable data hash</th>
+          <th>UUID /<br />Content address (PDH)</th>
           <th>Contents</th>
           <th></th>
         </tr>

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


hooks/post-receive
--