ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vkuliche...@apache.org
Subject [02/14] incubator-ignite git commit: Merge branch 'sprint-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-143
Date Thu, 12 Feb 2015 21:50:52 GMT
Merge branch 'sprint-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-143


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0751bcf2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0751bcf2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0751bcf2

Branch: refs/heads/ignite-143
Commit: 0751bcf23d08196eb7ce125e10aa1e68f02cff22
Parents: 91faaf6 1e65f16
Author: Valentin Kulichenko <vkulichenko@gridgain.com>
Authored: Tue Feb 10 12:48:01 2015 -0800
Committer: Valentin Kulichenko <vkulichenko@gridgain.com>
Committed: Tue Feb 10 12:48:01 2015 -0800

----------------------------------------------------------------------
 modules/clients/src/test/resources/spring-server-node.xml        | 2 +-
 modules/clients/src/test/resources/spring-server-ssl-node.xml    | 2 +-
 .../impl/connection/GridClientConnectionManagerAdapter.java      | 2 +-
 .../ignite/internal/client/router/impl/GridRouterClientImpl.java | 2 +-
 .../client/router/impl/GridTcpRouterNioListenerAdapter.java      | 4 ++--
 .../main/java/org/apache/ignite/internal/util/IgniteUtils.java   | 2 +-
 .../org/apache/ignite/marshaller/GridMarshallerAbstractTest.java | 2 +-
 .../org/apache/ignite/marshaller/GridMarshallerResourceBean.java | 2 +-
 .../org/apache/ignite/marshaller/GridMarshallerTestBean.java     | 2 +-
 9 files changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0751bcf2/modules/clients/src/test/resources/spring-server-node.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0751bcf2/modules/clients/src/test/resources/spring-server-ssl-node.xml
----------------------------------------------------------------------


Mime
View raw message