[ARVADOS-WORKBENCH2] updated: 1.1.4-325-g9157a28

[Git user]

Summary of changes:
 Makefile                                       | 3 ++-
 etc/arvados/workbench2/workbench2.example.json | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 etc/arvados/workbench2/workbench2.example.json

       via  9157a285ebb05c7ff0ae7a457ec5ffece17c3773 (commit)
       via  ea8725420ed2b4c3710925ac016ce10f288ab0aa (commit)
       via  46a41363f69391d4131180791f912329464d8a65 (commit)
      from  ea80145c5d632a647cf583cf0ebbf2a866d85549 (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 9157a285ebb05c7ff0ae7a457ec5ffece17c3773
Merge: ea80145 ea87254
Author: Fernando Monserrat <fernando.monserrat at gmail.com>
Date:   Tue Jul 17 15:49:33 2018 -0300

    closes #13838 "Merge branch '13838-site-conf-file'".
    Arvados-DCO-1.1-Signed-off-by: Fernando Monserrat <fmonserrat at veritasgenetics.com>


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


hooks/post-receive
--