[ARVADOS] updated: 208022fe681714471fb068a22b83576bf06980c4

[Git user]

Summary of changes:
 sdk/go/configfile/load.go    |  4 ++++
 services/keep-web/handler.go | 10 ++++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

       via  208022fe681714471fb068a22b83576bf06980c4 (commit)
      from  2ff1566d5cc6517dcd888f2175ddf6547891d207 (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 208022fe681714471fb068a22b83576bf06980c4
Author: Tom Clegg <tom at curoverse.com>
Date:   Mon Sep 19 09:43:11 2016 -0400

    9957: Add/fix comments.

diff --git a/sdk/go/configfile/load.go b/sdk/go/configfile/load.go
index c76d906..c915255 100644
--- a/sdk/go/configfile/load.go
+++ b/sdk/go/configfile/load.go
@@ -6,6 +6,10 @@ import (
 	"io/ioutil"
 )
 
+// LoadFile loads configuration from the file given by configPath and
+// decodes it into cfg.
+//
+// Currently, only JSON is supported. Support for YAML is anticipated.
 func LoadFile(cfg interface{}, configPath string) error {
 	buf, err := ioutil.ReadFile(configPath)
 	if err != nil {
diff --git a/services/keep-web/handler.go b/services/keep-web/handler.go
index 38df1d8..11d0d96 100644
--- a/services/keep-web/handler.go
+++ b/services/keep-web/handler.go
@@ -25,8 +25,8 @@ type handler struct {
 	setupOnce  sync.Once
 }
 
-// return a UUID or PDH if s begins with a UUID or URL-encoded PDH;
-// otherwise return "".
+// parseCollectionIDFromDNSName returns a UUID or PDH if s begins with
+// a UUID or URL-encoded PDH; otherwise "".
 func parseCollectionIDFromDNSName(s string) string {
 	// Strip domain.
 	if i := strings.IndexRune(s, '.'); i >= 0 {
@@ -49,8 +49,9 @@ func parseCollectionIDFromDNSName(s string) string {
 
 var urlPDHDecoder = strings.NewReplacer(" ", "+", "-", "+")
 
-// return a UUID or PDH if s is a UUID or a PDH (even if it is a PDH
-// with "+" replaced by " " or "-"); otherwise return "".
+// parseCollectionIDFromURL returns a UUID or PDH if s is a UUID or a
+// PDH (even if it is a PDH with "+" replaced by " " or "-");
+// otherwise "".
 func parseCollectionIDFromURL(s string) string {
 	if arvadosclient.UUIDMatch(s) {
 		return s
@@ -65,6 +66,7 @@ func (h *handler) setup() {
 	h.clientPool = arvadosclient.MakeClientPool()
 }
 
+// ServeHTTP implements http.Handler.
 func (h *handler) ServeHTTP(wOrig http.ResponseWriter, r *http.Request) {
 	h.setupOnce.Do(h.setup)
 

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


hooks/post-receive
--