Gary Russell 2bc0c442ce Merge remote-tracking branch 'upstream/master' into 4.0.0-WIP ...

Conflicts:
	spring-integration-core/src/main/java/org/springframework/integration/channel/registry/ChannelRegistry.java
	spring-integration-core/src/main/java/org/springframework/integration/channel/registry/LocalChannelRegistry.java
	spring-integration-core/src/main/java/org/springframework/integration/mapping/AbstractHeaderMapper.java
	spring-integration-core/src/main/java/org/springframework/integration/support/json/AbstractJacksonJsonMessageParser.java
	spring-integration-core/src/test/java/org/springframework/integration/channel/registry/LocalChannelRegistryTests.java
	spring-integration-core/src/test/java/org/springframework/integration/handler/ServiceActivatorDefaultFrameworkMethodTests.java
	spring-integration-jmx/src/test/java/org/springframework/integration/jmx/ServiceActivatorDefaultFrameworkMethodTests.java
	spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/OperationInvokingOutboundGatewayTests.java

Resolved.

2013-11-01 18:19:02 -04:00

..

src

Merge remote-tracking branch 'upstream/master' into 4.0.0-WIP

2013-11-01 18:19:02 -04:00

test

INT-2470 Add 'append to file' Capability

2012-06-14 18:36:02 -04:00

.springBeans

INT-2727 PseudoTX Refactoring

2012-09-05 16:55:34 -04:00