Merge remote-tracking branch 'origin/ignite-164v2' into ignite-164v2
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/cda4bcba Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/cda4bcba Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/cda4bcba Branch: refs/heads/sprint-1 Commit: cda4bcbab5d527d4741aadcba6bab74706d8f8b1 Parents: c323001 c39deb5 Author: Artem Shutak <[email protected]> Authored: Thu Feb 5 13:11:04 2015 +0300 Committer: Artem Shutak <[email protected]> Committed: Thu Feb 5 13:11:04 2015 +0300 ---------------------------------------------------------------------- .../gridify/GridifySetToXXXNonSpringAopSelfTest.java | 4 ++-- .../ignite/gridify/GridifySetToXXXSpringAopSelfTest.java | 4 ++-- .../org/apache/ignite/gridify/NonSpringAopSelfTest.java | 4 ++-- .../org/test/gridify/ExternalNonSpringAopSelfTest.java | 4 ++-- modules/clients/src/test/resources/log4j.xml | 6 +++--- modules/clients/src/test/resources/spring-router-ssl.xml | 4 ++-- modules/clients/src/test/resources/spring-router.xml | 6 +++--- modules/clients/src/test/resources/spring-server-node.xml | 2 +- .../clients/src/test/resources/spring-server-ssl-node.xml | 2 +- .../apache/ignite/configuration/IgniteDeploymentMode.java | 8 ++++---- .../java/org/apache/ignite/fs/IgniteFsConfiguration.java | 10 +++++----- .../internal/processors/spring/IgniteSpringProcessor.java | 4 ++-- .../java/org/apache/ignite/internal/util/IgniteUtils.java | 2 +- .../java/org/apache/ignite/jdbc/IgniteJdbcDriver.java | 4 ++-- .../org/apache/ignite/marshaller/IgniteMarshaller.java | 2 +- .../org/apache/ignite/spi/IgniteSpiManagementMBean.java | 4 ++-- .../apache/ignite/spi/securesession/SecureSessionSpi.java | 2 +- .../org/apache/ignite/spi/swapspace/SwapSpaceSpi.java | 2 +- .../org/apache/ignite/testframework/GridTestUtils.java | 4 ++-- .../testframework/junits/logger/GridTestLog4jLogger.java | 2 +- .../ignite/testsuites/IgniteCacheFailoverTestSuite.java | 2 +- .../apache/ignite/testsuites/IgniteLangSelfTestSuite.java | 2 +- .../near/GridCachePartitionedHitsAndMissesSelfTest.java | 2 +- .../org/apache/ignite/logger/log4j/IgniteLog4jLogger.java | 2 +- .../processors/spring/IgniteSpringProcessorImpl.java | 2 +- .../ignite/testsuites/IgniteResourceSelfTestSuite.java | 2 +- .../org/apache/ignite/tools/javadoc/IgniteLinkTaglet.java | 4 ++-- .../ignite/spi/deployment/uri/UriDeploymentSpi.java | 6 +++--- modules/visor-plugins/pom.xml | 4 ++-- .../ignite/startup/servlet/IgniteServletStartup.java | 2 +- 30 files changed, 54 insertions(+), 54 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cda4bcba/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cda4bcba/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cda4bcba/modules/core/src/test/java/org/apache/ignite/testframework/junits/logger/GridTestLog4jLogger.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cda4bcba/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/IgniteLog4jLogger.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cda4bcba/modules/web/src/main/java/org/apache/ignite/startup/servlet/IgniteServletStartup.java ----------------------------------------------------------------------
