Gary Russell
9146a374c1
Merge remote-tracking branch 'upstream/master' into 4.0.0-WIP
Conflicts:
spring-integration-core/src/main/java/org/springframework/integration/MessageHeaders.java
spring-integration-core/src/main/java/org/springframework/integration/context/IntegrationContextUtils.java
spring-integration-core/src/main/java/org/springframework/integration/json/JsonToObjectTransformer.java
spring-integration-core/src/main/java/org/springframework/integration/mapping/AbstractHeaderMapper.java
spring-integration-core/src/main/java/org/springframework/integration/metadata/package-info.java
spring-integration-feed/src/test/java/org/springframework/integration/feed/inbound/FeedEntryMessageSourceTests.java
spring-integration-redis/src/main/java/org/springframework/integration/redis/inbound/RedisInboundChannelAdapter.java
spring-integration-redis/src/main/java/org/springframework/integration/redis/outbound/RedisPublishingMessageHandler.java
spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisOutboundChannelAdapterParserTests.java
spring-integration-redis/src/test/java/org/springframework/integration/redis/inbound/RedisQueueMessageDrivenEndpointTests.java
spring-integration-redis/src/test/java/org/springframework/integration/redis/outbound/RedisQueueOutboundChannelAdapterTests.java
spring-integration-test/src/main/java/org/springframework/integration/test/matcher/HeaderMatcher.java
spring-integration-test/src/main/java/org/springframework/integration/test/matcher/MockitoMessageMatchers.java
spring-integration-test/src/main/java/org/springframework/integration/test/matcher/PayloadMatcher.java
spring-integration-twitter/src/test/java/org/springframework/integration/twitter/inbound/SearchReceivingMessageSourceTests.java
spring-integration-twitter/src/test/java/org/springframework/integration/twitter/inbound/SearchReceivingMessageSourceWithRedisTests.java
Resolved.
2013-11-05 14:30:50 -05:00
..
2013-11-05 14:30:50 -05:00
2010-11-19 03:49:13 -05:00