Merge branch 'ignite-65' of 
https://git-wip-us.apache.org/repos/asf/incubator-ignite into sprint-1


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

Branch: refs/heads/ignite-32
Commit: 9f2bb6c175e4fc9b83e26785d764ec88d1af4dc8
Parents: b9288ff cc43409
Author: Yakov Zhdanov <yzhda...@gridgain.com>
Authored: Thu Jan 22 19:04:14 2015 +0300
Committer: Yakov Zhdanov <yzhda...@gridgain.com>
Committed: Thu Jan 22 19:04:14 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(-)
----------------------------------------------------------------------


Reply via email to