[ARVADOS] updated: 1.1.4-297-g51dfa2c

[Git user]

Summary of changes:
 services/keep-balance/main.go  | 12 ++++++++++++
 services/keep-balance/usage.go |  8 +++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)

       via  51dfa2cac9daebe98da030bea84bfd64e70820fb (commit)
       via  02f24a0c4a01a7ab46645c21630b9f48065b4b96 (commit)
       via  012677d2d3fb4571da4a48ea49eae156f28bf6af (commit)
      from  1471ad4b235e168ccee4fa351b0025b2b380d7ac (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 51dfa2cac9daebe98da030bea84bfd64e70820fb
Merge: 1471ad4 02f24a0
Author: Ward Vandewege <wvandewege at veritasgenetics.com>
Date:   Tue May 22 09:58:52 2018 -0400

    9918: Merge branch '9918-index-timeout'
    
    refs #9918
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <wvandewege at veritasgenetics.com>


commit 02f24a0c4a01a7ab46645c21630b9f48065b4b96
Merge: 012677d 1471ad4
Author: Ward Vandewege <wvandewege at veritasgenetics.com>
Date:   Tue May 22 09:47:40 2018 -0400

    9918: Merge branch 'master' into 9918-index-timeout
    
    refs #9918
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <wvandewege at veritasgenetics.com>


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


hooks/post-receive
--