From e6ed387f42a195b2e76411dffba7be8a5d4a6de8 Mon Sep 17 00:00:00 2001 From: Armon Dadgar Date: Thu, 9 Oct 2014 12:28:07 -0700 Subject: [PATCH] consul: Deprecate ACLForceSet --- consul/leader.go | 4 ++-- consul/structs/structs.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/consul/leader.go b/consul/leader.go index 60a6737f9b..ba7280f9a1 100644 --- a/consul/leader.go +++ b/consul/leader.go @@ -129,7 +129,7 @@ func (s *Server) initializeACL() error { if acl == nil { req := structs.ACLRequest{ Datacenter: authDC, - Op: structs.ACLForceSet, + Op: structs.ACLSet, ACL: structs.ACL{ ID: anonymousToken, Name: "Anonymous Token", @@ -156,7 +156,7 @@ func (s *Server) initializeACL() error { if acl == nil { req := structs.ACLRequest{ Datacenter: authDC, - Op: structs.ACLForceSet, + Op: structs.ACLSet, ACL: structs.ACL{ ID: master, Name: "Master Token", diff --git a/consul/structs/structs.go b/consul/structs/structs.go index 910a1d3e05..5b3597bba4 100644 --- a/consul/structs/structs.go +++ b/consul/structs/structs.go @@ -440,7 +440,7 @@ type ACLOp string const ( ACLSet ACLOp = "set" - ACLForceSet = "force-set" + ACLForceSet = "force-set" // Deprecated, left to backwards compatibility ACLDelete = "delete" )