You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by se...@apache.org on 2015/02/02 02:54:08 UTC
[40/50] [abbrv] incubator-ignite git commit: Merge remote-tracking
branches 'remotes/origin/ignite-69',
'remotes/origin/ignite-71' and 'remotes/origin/ignite-72-1' into sprint-1
Merge remote-tracking branches 'remotes/origin/ignite-69', 'remotes/origin/ignite-71' and 'remotes/origin/ignite-72-1' 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/f64485ba
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f64485ba
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f64485ba
Branch: refs/heads/ignite-sql
Commit: f64485ba826858addfb68943db8fcf1b146af2e8
Parents: 5203363 43d54c2 8df3ac4 ae74087
Author: Anton Vinogradov <av...@gridgain.com>
Authored: Fri Jan 30 21:01:27 2015 +0300
Committer: Anton Vinogradov <av...@gridgain.com>
Committed: Fri Jan 30 21:01:27 2015 +0300
----------------------------------------------------------------------
assembly/release-base.xml | 2 +-
config/gridgain-log4j.xml | 152 -
config/ignite-log4j.xml | 152 +
config/java.util.logging.properties | 14 +-
.../apache/ignite/examples/ComputeExample.java | 59 +
.../ignite/examples/MessagingExample.java | 166 +
.../org/gridgain/examples/ComputeExample.java | 59 -
.../org/gridgain/examples/MessagingExample.java | 166 -
.../integration/ClientAbstractSelfTest.java | 2 +-
.../rest/RestBinaryProtocolSelfTest.java | 2 +-
.../java/org/apache/ignite/IgniteLogger.java | 2 +-
.../impl/GridRouterCommandLineStartup.java | 2 +-
.../apache/ignite/internal/GridProductImpl.java | 2 +-
.../apache/ignite/internal/IgniteKernal.java | 8 +-
.../org/apache/ignite/internal/IgnitionEx.java | 6 +-
.../handlers/log/GridLogCommandHandler.java | 2 +-
.../java/IgniteJavaLoggerFileHandler.java | 2 +-
.../ignite/thread/IgniteThreadFactory.java | 2 +-
modules/core/src/test/config/log4j-test.xml | 2 +-
.../loadtests/nio/GridNioBenchmarkTest.java | 2 +-
.../startup/GridRandomCommandLineLoader.java | 2 +-
.../testframework/junits/GridAbstractTest.java | 2 +-
.../logger/GridLog4jRollingFileAppender.java | 2 +-
.../junits/logger/GridTestLog4jLogger.java | 2 +-
.../src/test/resources/log/gridgain.log.tst | 13706 -----------------
.../core/src/test/resources/log/ignite.log.tst | 13706 +++++++++++++++++
.../child/GridHadoopExternalProcessStarter.java | 2 +-
.../apache/ignite/logger/jcl/GridJclLogger.java | 4 +-
.../ignite/logger/log4j/IgniteLog4jLogger.java | 2 +-
.../logger/log4j/IgniteLog4jNodeIdFilePath.java | 4 +-
.../log4j/GridLog4jCorrectFileNameTest.java | 4 +-
.../rest/protocols/http/jetty/rest.html | 6 +-
modules/scalar/pom.xml | 6 +-
.../util/nodestart/GridNodeCallableImpl.java | 2 +-
pom.xml | 10 +-
35 files changed, 14132 insertions(+), 14132 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f64485ba/modules/scalar/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f64485ba/pom.xml
----------------------------------------------------------------------