Merge branches 'ignite-35' and 'sprint-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-35
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/61a5b767 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/61a5b767 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/61a5b767 Branch: refs/heads/ignite-32 Commit: 61a5b767e18b69229c5db49ee0b8b3cfae27cad9 Parents: b7faae1 9f2bb6c Author: Yakov Zhdanov <yzhda...@gridgain.com> Authored: Thu Jan 22 20:08:44 2015 +0300 Committer: Yakov Zhdanov <yzhda...@gridgain.com> Committed: Thu Jan 22 20:08:44 2015 +0300 ---------------------------------------------------------------------- assembly/libs/readme.txt | 12 +++++------ docs/gridgain_readme.md | 4 ++-- examples/pom-standalone.xml | 18 ++++++++-------- modules/aop/readme.txt | 4 ++-- modules/aws/readme.txt | 4 ++-- .../org/apache/ignite/cluster/ClusterNode.java | 2 +- .../optimized/IgniteOptimizedClassResolver.java | 2 +- .../org/apache/ignite/mbean/IgniteMBean.java | 2 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 4 ++-- .../gridgain/grid/kernal/GridProductImpl.java | 12 +++++------ .../gridgain/grid/kernal/GridProperties.java | 2 +- .../grid/kernal/GridUpdateNotifier.java | 4 ++-- .../dataload/IgniteDataLoaderImpl.java | 2 +- .../core/src/main/resources/gridgain.properties | 22 -------------------- .../core/src/main/resources/ignite.properties | 22 ++++++++++++++++++++ .../grid/kernal/GridUpdateNotifierSelfTest.java | 2 +- modules/email/readme.txt | 4 ++-- modules/hadoop/readme.txt | 4 ++-- modules/hibernate/readme.txt | 4 ++-- modules/indexing/readme.txt | 4 ++-- modules/jcl/readme.txt | 4 ++-- modules/jta/readme.txt | 4 ++-- modules/log4j/readme.txt | 4 ++-- modules/rest-http/readme.txt | 4 ++-- modules/scalar/pom.xml | 4 ++-- modules/scalar/readme.txt | 4 ++-- modules/schedule/readme.txt | 4 ++-- modules/slf4j/readme.txt | 4 ++-- modules/spring/readme.txt | 4 ++-- modules/ssh/readme.txt | 4 ++-- modules/urideploy/readme.txt | 4 ++-- .../visor/commands/node/VisorNodeCommand.scala | 4 ++-- modules/web/readme.txt | 4 ++-- pom.xml | 10 ++++----- 34 files changed, 98 insertions(+), 98 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/61a5b767/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java ----------------------------------------------------------------------
