ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [2/2] incubator-ignite git commit: Merge branch 'ignite-164v2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-164v2
Date Thu, 05 Feb 2015 11:30:12 GMT
Merge branch 'ignite-164v2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite 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/758ff46c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/758ff46c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/758ff46c

Branch: refs/heads/ignite-164v2
Commit: 758ff46c0acd7f74d92c8f71910d2621f1856d22
Parents: 46eecdd b4d97f5
Author: ivasilinets <vasilinetc.ira@gmail.com>
Authored: Thu Feb 5 14:29:18 2015 +0300
Committer: ivasilinets <vasilinetc.ira@gmail.com>
Committed: Thu Feb 5 14:29:18 2015 +0300

----------------------------------------------------------------------
 bin/include/functions.sh                        |  4 +--
 bin/include/parseargs.sh                        |  2 +-
 bin/include/service.sh                          |  6 ++--
 bin/include/setenv.sh                           |  2 +-
 bin/setup-hadoop.sh                             |  2 +-
 .../processors/rest/RestProcessorTest.java      |  6 ++--
 .../apache/ignite/internal/GridDiagnostic.java  |  2 +-
 .../ignite/internal/GridUpdateNotifier.java     |  2 +-
 .../ignite/internal/IgniteComponentType.java    |  2 +-
 .../ignite/internal/IgniteEventsImpl.java       |  2 +-
 .../apache/ignite/internal/IgniteKernal.java    | 32 ++++++++++----------
 .../org/apache/ignite/internal/IgnitionEx.java  |  4 +--
 .../internal/managers/GridManagerAdapter.java   |  2 +-
 .../managers/communication/GridIoManager.java   |  2 +-
 .../internal/processors/fs/GridGgfsImpl.java    |  2 +-
 .../schedule/IgniteNoopScheduleProcessor.java   |  2 +-
 .../nio/GridConnectionBytesVerifyFilter.java    |  2 +-
 .../util/nodestart/GridNodeStartUtils.java      |  2 +-
 .../apache/ignite/internal/util/typedef/X.java  |  2 +-
 .../ignite/jdbc/IgniteJdbcConnection.java       |  2 +-
 .../ignite/jdbc/IgniteJdbcDatabaseMetadata.java |  6 ++--
 .../apache/ignite/jdbc/IgniteJdbcDriver.java    |  6 ++--
 .../apache/ignite/jdbc/IgniteJdbcResultSet.java |  2 +-
 .../apache/ignite/jdbc/IgniteJdbcStatement.java |  2 +-
 .../IgniteOptimizedObjectInputStream.java       |  2 +-
 .../org/apache/ignite/mxbean/IgniteMXBean.java  |  4 +--
 .../spi/discovery/tcp/TcpDiscoverySpi.java      |  4 +--
 .../ignite/startup/cmdline/AboutDialog.java     |  2 +-
 .../startup/cmdline/CommandLineStartup.java     |  4 +--
 .../startup/cmdline/CommandLineTransformer.java |  2 +-
 .../apache/ignite/internal/GridStartupMain.java |  6 ++--
 .../apache/ignite/internal/GridStartupTest.java |  6 ++--
 .../internal/GridUpdateNotifierSelfTest.java    |  2 +-
 .../communication/GridIoManagerSelfTest.java    |  4 +--
 .../apache/ignite/lang/GridFuncSelfTest.java    |  2 +-
 .../loadtests/cache/GridCacheBenchmark.java     |  8 ++---
 .../loadtests/mapper/GridNodeStartup.java       |  6 ++--
 .../AbstractDiscoveryRandomStartStopTest.java   |  2 +-
 .../startup/GridRandomCommandLineLoader.java    |  2 +-
 .../GridCommandLineTransformerSelfTest.java     |  4 +--
 .../testframework/junits/GridAbstractTest.java  |  4 +--
 .../GridHadoopClientProtocolProvider.java       |  6 ++--
 .../apache/ignite/hadoop/GridHadoopSetup.java   | 18 +++++------
 .../loadtests/ggfs/GridGgfsNodeStartup.java     |  6 ++--
 .../GridHibernateTransactionalDataRegion.java   |  6 ++--
 .../rest/protocols/http/jetty/rest.html         |  6 ++--
 .../ignite/cache/spring/SpringCacheManager.java |  2 +-
 .../util/nodestart/GridNodeCallableImpl.java    |  2 +-
 .../optimized/OptimizedClassNamesGenerator.java |  2 +-
 .../util/antgar/IgniteDeploymentGarAntTask.java |  4 +--
 .../ignite/visor/commands/VisorConsole.scala    |  2 +-
 .../commands/alert/VisorAlertCommand.scala      |  4 +--
 .../config/VisorConfigurationCommand.scala      |  2 +-
 .../commands/disco/VisorDiscoveryCommand.scala  |  6 ++--
 .../commands/events/VisorEventsCommand.scala    |  6 ++--
 .../commands/start/VisorStartCommand.scala      |  8 ++---
 .../commands/tasks/VisorTasksCommand.scala      |  6 ++--
 .../scala/org/apache/ignite/visor/visor.scala   | 26 ++++++++--------
 .../cache/websession/GridWebSessionFilter.java  |  2 +-
 .../IgniteServletContextListenerStartup.java    |  4 +--
 .../startup/servlet/IgniteServletStartup.java   |  2 +-
 61 files changed, 141 insertions(+), 141 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/758ff46c/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestProcessorTest.java
----------------------------------------------------------------------


Mime
View raw message