Gary Russell 3080b892d5 Merge remote-tracking branch 'upstream/master' into 4.0.0-WIP ...

Conflicts:
	spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayInterfaceTests.java
	spring-integration-core/src/test/java/org/springframework/integration/router/config/RouterWithMappingTests.java
	spring-integration-groovy/src/main/java/org/springframework/integration/groovy/GroovyScriptExecutingMessageProcessor.java
	spring-integration-http/src/test/java/org/springframework/integration/http/inbound/HttpRequestHandlingMessagingGatewayWithPathMappingTests.java
	spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/store/channel/AbstractTxTimeoutMessageStoreTests.java
	spring-integration-jmx/src/main/java/org/springframework/integration/jmx/OperationInvokingMessageHandler.java

Resolved.

2013-10-30 23:13:27 -04:00

..

src

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

2013-10-30 23:13:27 -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