consul: Deprecate ACLForceSet

This commit is contained in:
Armon Dadgar 2014-10-09 12:28:07 -07:00
parent c832ea8aa3
commit e6ed387f42
2 changed files with 3 additions and 3 deletions

View File

@ -129,7 +129,7 @@ func (s *Server) initializeACL() error {
if acl == nil { if acl == nil {
req := structs.ACLRequest{ req := structs.ACLRequest{
Datacenter: authDC, Datacenter: authDC,
Op: structs.ACLForceSet, Op: structs.ACLSet,
ACL: structs.ACL{ ACL: structs.ACL{
ID: anonymousToken, ID: anonymousToken,
Name: "Anonymous Token", Name: "Anonymous Token",
@ -156,7 +156,7 @@ func (s *Server) initializeACL() error {
if acl == nil { if acl == nil {
req := structs.ACLRequest{ req := structs.ACLRequest{
Datacenter: authDC, Datacenter: authDC,
Op: structs.ACLForceSet, Op: structs.ACLSet,
ACL: structs.ACL{ ACL: structs.ACL{
ID: master, ID: master,
Name: "Master Token", Name: "Master Token",

View File

@ -440,7 +440,7 @@ type ACLOp string
const ( const (
ACLSet ACLOp = "set" ACLSet ACLOp = "set"
ACLForceSet = "force-set" ACLForceSet = "force-set" // Deprecated, left to backwards compatibility
ACLDelete = "delete" ACLDelete = "delete"
) )