Merge branch 'master' of https://github.com/sogou/workflow into nossl

src/nameservice/UpstreamPolicies.cc

@@ -360,7 +360,6 @@ int UPSGroupPolicy::remove_server_locked(const std::string& address)
 			else
 				vec = &group->backups;
 
-			//std::lock_guard<std::mutex> lock(group->mutex);
 			pthread_mutex_lock(&group->mutex);
 			if (params->server_type == 0)
 				group->weight -= params->weight;

src/nameservice/WFServiceGovernance.cc

@@ -354,7 +354,6 @@ bool WFServiceGovernance::select(const ParsedURI& uri, WFNSTracing *tracing,
 		return false;
 	}
 
-	// select_addr == NULL will only happened in consistent_hash
 	EndpointAddress *select_addr = this->first_strategy(uri, tracing);
 
 	if (!select_addr ||