Merge branch '2449-keep-write-blocks' into 2449-keep-flags

Conflicts:
	services/keep/keep.go

diff --cc services/keep/keep.go
index aa95d02cc5ccac03c87d394206777c595940b3e4,5083e690a14d041f146fae8f5704b8aaa072fefd..897e5040f7f9daf7c27e117f492458dd0655fe55
--- 1/services/keep/keep.go
--- 2/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