[ARVADOS] updated: 7ca1198b2e64cdd823f424c1bd009f364abfe2d0

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/test/integration_helper.rb |    5 +-
 services/keep/keep.go                     |  151 ++++++++++++++++++++++++-----
 services/keep/keep_test.go                |   36 ++++++-
 3 files changed, 158 insertions(+), 34 deletions(-)

       via  7ca1198b2e64cdd823f424c1bd009f364abfe2d0 (commit)
       via  4eba2cb5d7d6a5d76b9ce4d3f535a1de911400cd (commit)
       via  bc4eea1e54651c507b8add0f5edc80968673c6fc (commit)
       via  61f1066c9ff0114b5c321832a8002cb2511480ca (commit)
       via  5dd1c07e56d32ae4c569ceffdbd4549bceb92de4 (commit)
      from  c4a50125bec07063e91be6ca7c7ce209d5840642 (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 7ca1198b2e64cdd823f424c1bd009f364abfe2d0
Merge: c4a5012 4eba2cb
Author: Tim Pierce <twp at curoverse.com>
Date:   Tue Apr 8 14:09:53 2014 -0400

    Merge branch '2449-keep-write-blocks' into 2449-keep-flags
    
    Conflicts:
    	services/keep/keep.go

diff --cc services/keep/keep.go
index aa95d02,5083e69..897e504
--- a/services/keep/keep.go
+++ b/services/keep/keep.go
@@@ -2,20 -2,30 +2,31 @@@ package mai
  
  import (
  	"bufio"
+ 	"bytes"
  	"crypto/md5"
  	"errors"
 +	"flag"
  	"fmt"
  	"github.com/gorilla/mux"
  	"log"
  	"net/http"
  	"os"
+ 	"os/exec"
+ 	"strconv"
  	"strings"
+ 	"time"
  )
  
 -// Default TCP port on which to listen for requests.
 -const DEFAULT_PORT = 25107
++// Default TCP address on which to listen for requests.
 +const DEFAULT_ADDR = ":25107"
+ 
+ // A Keep "block" is 64MB.
  const BLOCKSIZE = 64 * 1024 * 1024
  
+ // A Keep volume must have at least MIN_FREE_KILOBYTES available
+ // in order to permit writes.
+ const MIN_FREE_KILOBYTES = BLOCKSIZE / 1024
+ 
  var PROC_MOUNTS = "/proc/mounts"
  
  var KeepVolumes []string

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


hooks/post-receive
--