Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
Files
ab99c943ab7ac509f9e7435f11309b73cb3cc073
spring-integration/spring-integration-redis
History
Gary Russell ab99c943ab Merge remote-tracking branch 'upstream/master' into 4.0.0-WIP 
Conflicts:
	spring-integration-ftp/src/test/java/org/springframework/integration/ftp/outbound/FtpServerOutboundTests.java
	spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsMessageDrivenChannelAdapterParserTests.java
	spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisInboundChannelAdapterParserTests.java
	spring-integration-sftp/src/test/java/org/springframework/integration/sftp/outbound/SftpServerOutboundTests.java

Resolved.
2013-11-07 17:43:19 -05:00
..
src
Merge remote-tracking branch 'upstream/master' into 4.0.0-WIP
2013-11-07 17:43:19 -05:00
si-redis.conf
INT-2328-v3 polishing tests
2011-12-21 14:10:08 -05:00