From 54931afa8bdf605aa0cde88a7f0e62acca80b25a Mon Sep 17 00:00:00 2001
From: Spencer Gibb <spencer@gibb.us>
Date: Sat, 16 Jul 2016 10:36:27 -0600
Subject: [PATCH] Remove assertion that fails in spring 4.3.x

Need to make this class 4.2.x compatible.

see gh-1192
---
 .../cloud/netflix/feign/FeignClientsRegistrar.java              | 2 --
 1 file changed, 2 deletions(-)

diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/FeignClientsRegistrar.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/FeignClientsRegistrar.java
index 61feb10b..3501b30d 100644
--- a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/FeignClientsRegistrar.java
+++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/FeignClientsRegistrar.java
@@ -190,8 +190,6 @@ class FeignClientsRegistrar implements ImportBeanDefinitionRegistrar,
 
 	private void validate(Map<String, Object> attributes) {
 		if (StringUtils.hasText((String) attributes.get("value"))) {
-			Assert.isTrue(!StringUtils.hasText((String) attributes.get("name")),
-					"Either name or value can be specified, but not both");
 			Assert.isTrue(!StringUtils.hasText((String) attributes.get("serviceId")),
 					"Either name (serviceId) or value can be specified, but not both");
 		}