commit 64d62b59be68cb6c8f9152c22426d419fea0dc36
author Suharsh Sivakumar <suharshs@google.com> Thu Apr 02 05:30:41 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Apr 02 05:30:41 2015 +0000
tree 4cc9b3ed5295fd08de191b8ec0d3441f0db2bc6d
parent fcbffb881ffe325003dcd249c8f951144f6939af
parent 02cc2798f82d6a8db1e22046c9253a8d56e82d3b

Merge "ref/roled: Change flag from using underscore to using hyphen."

cmd/principal/principal_v23_test.go

diff --git a/cmd/principal/principal_v23_test.go b/cmd/principal/principal_v23_test.go
index c5381b8..79f91c9 100644
--- a/cmd/principal/principal_v23_test.go
+++ b/cmd/principal/principal_v23_test.go
@@ -88,7 +88,7 @@
 	redirect(t, bin.WithEnv(blessEnv).Start("--v23.credentials="+bobDir, "get", "forpeer", "alice/server"), bobForPeer)
 
 	got := removeCaveats(removePublicKeys(bin.Start("dumpblessings", bobForPeer).Output()))
-	want := `Blessings          : bob#alice/friend
+	want := `Blessings          : bob,alice/friend
 PublicKey          : XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX
 Certificate chains : 2
 Chain #0 (1 certificates). Root certificate public key: XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX

services/identity/internal/templates/caveats.go

diff --git a/services/identity/internal/templates/caveats.go b/services/identity/internal/templates/caveats.go
index 206a87e..466cf7e 100644
--- a/services/identity/internal/templates/caveats.go
+++ b/services/identity/internal/templates/caveats.go
@@ -140,6 +140,11 @@
     </div>
   </div>
   <br/>
+  <div>
+  The blessing name will be visible to any peers that this blessing is shared
+with. Thus, if your email address is in the blessing name, it will be visible
+to peers you share the blessing with.
+  </div>
   <div class="grid">
     <button class="cell button-passive" type="submit">Bless</button>
     <button class="cell button-passive" id="cancel">Cancel</button>