[ARVADOS] updated: 0dab1775b07d67ca25974c5b68189717b9f8952f

[git at public.curoverse.com]

Summary of changes:
 services/keep-web/anonymous.go | 2 +-
 services/keep-web/doc.go       | 4 ++--
 services/keep-web/handler.go   | 2 --
 3 files changed, 3 insertions(+), 5 deletions(-)

       via  0dab1775b07d67ca25974c5b68189717b9f8952f (commit)
       via  62817f027167fbe5fc5b66bbdc04261da16fe3ef (commit)
      from  7bf5f28cec1ff7be1e66925c3815c253989f9eb1 (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 0dab1775b07d67ca25974c5b68189717b9f8952f
Author: Tom Clegg <tom at curoverse.com>
Date:   Tue Nov 3 09:55:50 2015 -0500

    5824: Use session cookie instead of persistent.

diff --git a/services/keep-web/handler.go b/services/keep-web/handler.go
index 21d58b7..3e38cc3 100644
--- a/services/keep-web/handler.go
+++ b/services/keep-web/handler.go
@@ -10,7 +10,6 @@ import (
 	"net/url"
 	"os"
 	"strings"
-	"time"
 
 	"git.curoverse.com/arvados.git/sdk/go/arvadosclient"
 	"git.curoverse.com/arvados.git/sdk/go/auth"
@@ -180,7 +179,6 @@ func (h *handler) ServeHTTP(wOrig http.ResponseWriter, r *http.Request) {
 			Name:     "arvados_api_token",
 			Value:    auth.EncodeTokenCookie([]byte(t)),
 			Path:     "/",
-			Expires:  time.Now().AddDate(10, 0, 0),
 			HttpOnly: true,
 		})
 		redir := (&url.URL{Host: r.Host, Path: r.URL.Path}).String()

commit 62817f027167fbe5fc5b66bbdc04261da16fe3ef
Author: Tom Clegg <tom at curoverse.com>
Date:   Tue Nov 3 09:52:33 2015 -0500

    5824: Clarity edits in usage docs.

diff --git a/services/keep-web/anonymous.go b/services/keep-web/anonymous.go
index 85ea1c6..bfc716f 100644
--- a/services/keep-web/anonymous.go
+++ b/services/keep-web/anonymous.go
@@ -20,5 +20,5 @@ func (ts *tokenSet) String() string {
 
 func init() {
 	flag.Var(&anonymousTokens, "anonymous-token",
-		"API token to try when none of the tokens provided in an HTTP request succeed in reading the desired collection. If this flag is used more than once, each token will be attempted in turn until one works.")
+		"API token to try when none of the tokens provided in an HTTP request succeed in reading the desired collection. Multiple anonymous tokens can be provided by using this flag more than once; each token will be attempted in turn until one works.")
 }
diff --git a/services/keep-web/doc.go b/services/keep-web/doc.go
index 2ebda6e..5aa09e2 100644
--- a/services/keep-web/doc.go
+++ b/services/keep-web/doc.go
@@ -93,8 +93,8 @@
 //
 // In all of the above forms, the "uuid_or_pdh" part can be either a
 // collection UUID or a portable data hash with the "+" character
-// optionally replaced by "-". (Replacing "+" with "-" is mandatory
-// when "uuid_or_pdh" appears in the domain name only because "+" is
+// optionally replaced by "-". (When "uuid_or_pdh" appears in the
+// domain name, replacing "+" with "-" is mandatory, because "+" is
 // not a valid character in a domain name.)
 //
 // In all of the above forms, a top level directory called "_" is

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


hooks/post-receive
--