Merge remote-tracking branch 'origin/master'

src/main/resources/spring-context-jedis.xml

@@ -20,8 +20,8 @@
 		<constructor-arg index="0" ref="jedisPoolConfig" />
 		<constructor-arg index="1" value="${redis.host}" />
 		<constructor-arg index="2" value="${redis.port}" type="int" />
-<!--		<constructor-arg index="3" value="${redis.timeout}" type="int" />-->
-<!--		<constructor-arg index="4" value="${redis.password}" />-->
+		<constructor-arg index="3" value="${redis.timeout}" type="int" />
+		<constructor-arg index="4" value="${redis.password}" />
 	</bean>
 
 </beans>