Merge pull request #977 from sdboyer/master

nit: Condense switch fallthroughs into expression lists

consul/client.go

@@ -224,9 +224,7 @@ func (c *Client) lanEventHandler() {
 			switch e.EventType() {
 			case serf.EventMemberJoin:
 				c.nodeJoin(e.(serf.MemberEvent))
-			case serf.EventMemberLeave:
+			case serf.EventMemberLeave, serf.EventMemberFailed:
-				fallthrough
-			case serf.EventMemberFailed:
 				c.nodeFail(e.(serf.MemberEvent))
 			case serf.EventUser:
 				c.localEvent(e.(serf.UserEvent))

consul/fsm.go

@@ -230,9 +230,7 @@ func (c *consulFSM) applyACLOperation(buf []byte, index uint64) interface{} {
 	}
 	defer metrics.MeasureSince([]string{"consul", "fsm", "acl", string(req.Op)}, time.Now())
 	switch req.Op {
-	case structs.ACLForceSet:
+	case structs.ACLForceSet, structs.ACLSet:
-		fallthrough
-	case structs.ACLSet:
 		if err := c.state.ACLSet(index, &req.ACL); err != nil {
 			return err
 		} else {

consul/serf.go

@@ -41,9 +41,7 @@ func (s *Server) lanEventHandler() {
 				s.nodeJoin(e.(serf.MemberEvent), false)
 				s.localMemberEvent(e.(serf.MemberEvent))
 
-			case serf.EventMemberLeave:
+			case serf.EventMemberLeave, serf.EventMemberFailed:
-				fallthrough
-			case serf.EventMemberFailed:
 				s.nodeFailed(e.(serf.MemberEvent), false)
 				s.localMemberEvent(e.(serf.MemberEvent))
 
@@ -71,9 +69,7 @@ func (s *Server) wanEventHandler() {
 			switch e.EventType() {
 			case serf.EventMemberJoin:
 				s.nodeJoin(e.(serf.MemberEvent), true)
-			case serf.EventMemberLeave:
+			case serf.EventMemberLeave, serf.EventMemberFailed:
-				fallthrough
-			case serf.EventMemberFailed:
 				s.nodeFailed(e.(serf.MemberEvent), true)
 			case serf.EventMemberUpdate: // Ignore
 			case serf.EventMemberReap: // Ignore