INT-2659 upgraded to Spring Data Redis 1.0.1
Merge pull request #550 from olegz/INT-2659
INT-2666 Fix NPE in SimpleMessageStore

INT-2666 polished test

Polishing
Merge pull request #542 from olegz/INT-2666
INT-1958 - Make HttpRequestHandlingEndpointSupport public

For reference: https://jira.springsource.org/browse/INT-1958
Merge pull request #542 from ghillert/INT-1958

Previous merge should have referenced #552
INT-2574 Document "max-rows-per-poll" vs "max-messages-per-poll"

For reference see: https://jira.springsource.org/browse/INT-2574
Merge pull request #549 from ghillert/INT-2574
INT-2285 Implement max-subscribers on Channels

Add a subscriber limit on both unicast and publish-subscribe
channels. This permits detection of inadvertent channel wiring
during context initialization.

Also add a mechanism to globally set these defaults.

Two properties are added to ChannelInitializer. If the
'channelInitializer' bean is declared before a channel, and
these properties are set, it will globally override the
default (Integer.MAX_VALUE) for these properties.

For example:

    <bean id="channelInitializer" class="org.springframework.integration.config.xml.ChannelInitializer">
        <property name="autoCreate" value="true" />
        <property name="defaultMaxUnicastSubscribers" value="1" />
        <property name="defaultMaxMulticastSubscribers" value="2" />
    </bean>

will make the default max-subscribers 1 and 2 for <channel/> and
<publish-subscribe/> channels respectively.

Also applies to module channels (jms, amqp, redis).
Merge pull request #543 from garyrussell/INT-2285

* garyrussell-INT-2285:
  INT-2285 Implement max-subscribers on Channels
INT-2262 - Add reply-timeout to Outbound Gateways

For reference see: https://jira.springsource.org/browse/INT-2262

Add reply-timeout attribute to:

* Amqp Outbound Gateway
* File Outbound Gateway
* Ftp Outbound Gateway
* Sftp Outbound Gateway
* Ws Outbound Gateway

Update Schema Documentation for reply-timeout attribute:

* spring-integration-jpa-2.2.xsd
* spring-integration-jms-2.2.xsd
* spring-integration-jdbc-2.2.xsd
* spring-integration-ip-2.2.xsd
* spring-integration-http-2.2.xsd

Update the *What's new in Spring Integration 2.2* section in the reference manual

INT-2262 - Code Review

* Update copyright year for affected files
* Update author tags for affected files
Merge pull request #547 from ghillert/INT-2262
INT-2677 Upgrade JMS Module to use ActiveMQ 5.6.0
Merge pull request #555 from olegz/INT-2677
INT-2678: fix a couple of typo

* changes-2.0-2.1.xml: the subject of INT-2678
* delayer.xml <classname> tag typo
Merge pull request #556 from artembilan/INT-2678

* INT-2678:
  INT-2678: fix a couple of typo
INT-2665 JMX Endpoints And Remote MBeanServer

JMX endpoints need a reference to an MBeanServer. The MBeanServer
is a sub-interface of MBeanServerConnection.

When connecting to a remote MBeanServer, the server is an
instanceof MBeanServerConnection, not MBeanServer.

Change the Endpoints to get a reference to an MBeanServerConnection.

Add IOException catch clauses where necessary.
Merge pull request #554 from garyrussell/INT-2665

* INT-2665:
  INT-2665 JMX Endpoints And Remote MBeanServer