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

..

local-test-dir

INT-1631 removed local test files that ended up there accidently

2010-11-17 20:04:02 -05:00

remote-target-dir

INT-1614 adding @Ignored sanity tests

2010-11-19 13:05:23 -05:00

remote-test-dir

INT-1614 fixed tests in FTP

2010-11-19 22:35:42 -05:00

src

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

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

.gitignore

polishing

2010-12-17 12:06:16 -05:00

.springBeans

INT-1961 added tests to validate that Sftp Inbound Adapter is NOT running when 'auto-startup' is set to 'false'

2011-07-06 17:56:27 -04:00