[ARVADOS] updated: 3a4b7ec9daecbff438c83380c6beccaf88d9e47c

[git at public.curoverse.com]

Summary of changes:
 services/api/script/salvage_collection.rb          |   1 +
 .../keepproxy/pkg-extras/etc/default/keepproxy     |   7 +
 services/keepproxy/pkg-extras/etc/init.d/keepproxy | 156 +++++++++++++++++++++
 3 files changed, 164 insertions(+)
 create mode 100644 services/keepproxy/pkg-extras/etc/default/keepproxy
 create mode 100755 services/keepproxy/pkg-extras/etc/init.d/keepproxy

       via  3a4b7ec9daecbff438c83380c6beccaf88d9e47c (commit)
       via  f235c17c253d9ece933c972039e4872ef7157533 (commit)
       via  4ad7111513fabbdce01794c283791c8dc9459aa4 (commit)
      from  f3f86fcf67775df91937392dd74a527dcbcf1886 (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 3a4b7ec9daecbff438c83380c6beccaf88d9e47c
Merge: f3f86fc f235c17
Author: Ward Vandewege <ward at curoverse.com>
Date:   Tue Sep 29 13:50:44 2015 -0400

    Merge branch 'master' into 7330-improved-sso-package
    
    refs #7330


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


hooks/post-receive
--