You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2017/04/19 12:13:11 UTC

[1/2] ignite git commit: IGNITE-4898: Added ODBC installers paths to README. This closes #1753.

Repository: ignite
Updated Branches:
  refs/heads/ignite-2.0 52bb84dba -> 3ab6e481a


IGNITE-4898: Added ODBC installers paths to README. This closes #1753.


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

Branch: refs/heads/ignite-2.0
Commit: f278dc969a69ad3c166fc863de5b0ffcd46a19c6
Parents: 5dab5fb
Author: isapego <ig...@gmail.com>
Authored: Wed Apr 19 15:12:42 2017 +0300
Committer: devozerov <vo...@gridgain.com>
Committed: Wed Apr 19 15:12:42 2017 +0300

----------------------------------------------------------------------
 modules/platforms/cpp/odbc/README.txt | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/f278dc96/modules/platforms/cpp/odbc/README.txt
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/odbc/README.txt b/modules/platforms/cpp/odbc/README.txt
index fe40a5c..3a83f84 100644
--- a/modules/platforms/cpp/odbc/README.txt
+++ b/modules/platforms/cpp/odbc/README.txt
@@ -19,13 +19,13 @@ arguments:
 
 1. Address of the node to connect to:
    SERVER=<host_name_or_IP_address>;
-   
+
 2. Port on which OdbcProcessor of the node is listening:
    PORT=<TCP_port>;
-   
+
 3. Datagrid cache to connect to:
    CACHE=<cache_name>;
-   
+
 All arguments are case-insensitive so "SERVER", "Server" and "server" all are
 valid server address arguments.
 
@@ -46,11 +46,11 @@ ODBC driver you should perfrom the following steps:
    $ ldd /usr/local/lib/libignite-odbc.so.
    If there is unresolved links to other libraries you may want to add
    directories with these libraries to the LD_LIBRARY_PATH.
-   
+
 2. Edit file $IGNITE_HOME/platforms/cpp/odbc/install/ignite-odbc-install.ini
    and ensure that "Driver" parameter of the "Apache Ignite" section points
    to the right location where libignite-odbc.so is located.
-   
+
 3. To install Apache Ignite ODBC driver use the following command:
    $ odbcinst -i -d -f $IGNITE_HOME/platforms/cpp/odbc/install/ignite-odbc-install.ini
    To perform this command you most likely will need root privileges.
@@ -67,9 +67,12 @@ There are two ways to install ODBC driver currently. The first one is to use
 32-bit or 64-bit installer. This is the most simple way and you are recommended
 to stick to it by default.
 
+32-bit installer : $IGNITE_HOME/platforms/cpp/bin/odbc/ignite-odbc-x86.msi
+64-bit installer : $IGNITE_HOME/platforms/cpp/bin/odbc/ignite-odbc-amd64.msi
+
 However there is also another way to install driver manually using scripts. If
 you choose this method you should first choose a directory on your filesystem
-where your driver or drivers will be located. Once you have choosen the place
+where your driver or drivers will be located. Once you have chosen the place
 you should put your driver there and ensure that all driver dependencies can be
 resolved i.e. they can be found either in the %PATH% or in the same directory
 as the driver.
@@ -88,7 +91,7 @@ Thats it. Your driver/drivers are installed.
 
 After the installation
 =======================================
-   
+
 Now Apache Ignite ODBC driver is installed and ready for use. You can connect
 to it and use it like to any other ODBC driver.
 


[2/2] ignite git commit: Merge remote-tracking branch 'origin/ignite-2.0' into ignite-2.0

Posted by vo...@apache.org.
Merge remote-tracking branch 'origin/ignite-2.0' into ignite-2.0


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

Branch: refs/heads/ignite-2.0
Commit: 3ab6e481abb4f19389ed51448a596e5dd6d1f232
Parents: f278dc9 52bb84d
Author: devozerov <vo...@gridgain.com>
Authored: Wed Apr 19 15:13:03 2017 +0300
Committer: devozerov <vo...@gridgain.com>
Committed: Wed Apr 19 15:13:03 2017 +0300

----------------------------------------------------------------------
 assembly/release-fabric-base.xml                |   5 -
 config/dotnet/default-dotnet.xml                |  45 --
 .../Apache.Ignite.Core.Tests.csproj             |   7 +
 .../Binary/BinaryBuilderSelfTest.cs             |   3 +-
 .../BinaryBuilderSelfTestDynamicRegistration.cs |   2 +
 .../Binary/BinaryBuilderSelfTestSimpleName.cs   |   2 +
 .../Binary/BinaryCompactFooterInteropTest.cs    |   4 +-
 .../BinaryConfigurationTest.cs                  |   4 +-
 .../Cache/AddArgCacheEntryProcessor.cs          |  91 ++++
 .../Cache/Affinity/AffinityFunctionTest.cs      |   1 -
 .../Cache/Affinity/AffinityTest.cs              |  10 +-
 .../BinarizableAddArgCacheEntryProcessor.cs     |  53 +++
 .../Cache/BinarizableTestException.cs           |  51 +++
 .../Cache/CacheAbstractTest.cs                  | 422 ++++---------------
 .../Cache/CacheDynamicStartTest.cs              | 164 +++----
 .../Cache/CacheForkedTest.cs                    |   6 +-
 .../Cache/CacheTestKey.cs                       |  68 +++
 .../Cache/NonSerializableCacheEntryProcessor.cs |  40 ++
 .../Cache/NonSerializableException.cs           |  40 ++
 .../Cache/Query/CacheQueriesTest.cs             |  35 +-
 .../Continuous/ContinuousQueryAbstractTest.cs   |  45 +-
 .../Continuous/ContinuousQueryJavaFilterTest.cs |  21 +-
 .../Cache/Store/CacheParallelLoadStoreTest.cs   |   9 +-
 .../Cache/Store/CacheStoreSessionTest.cs        |  15 +-
 .../Cache/Store/CacheStoreTest.cs               |  17 +-
 .../Cache/TestReferenceObject.cs                |  40 ++
 .../Compute/AbstractTaskTest.cs                 |  29 +-
 .../Compute/BinarizableClosureTaskTest.cs       |  14 +-
 .../Compute/BinarizableTaskTest.cs              |  15 -
 .../Compute/ComputeApiTest.cs                   |   9 +-
 .../Compute/ComputeApiTestFullFooter.cs         |   4 +-
 .../Compute/FailoverTaskSelfTest.cs             |   6 -
 .../Compute/ResourceTaskTest.cs                 |  60 +--
 .../Compute/SerializableClosureTaskTest.cs      |   1 +
 .../Compute/TaskAdapterTest.cs                  |   6 -
 .../Compute/TaskResultTest.cs                   |  12 -
 .../Dataload/DataStreamerTest.cs                |  55 +--
 .../Apache.Ignite.Core.Tests/DeploymentTest.cs  |   4 +-
 .../Apache.Ignite.Core.Tests/EventsTest.cs      |  65 +--
 .../Apache.Ignite.Core.Tests/ExceptionsTest.cs  |  13 +-
 .../Apache.Ignite.Core.Tests/ExecutableTest.cs  |  57 +--
 .../Apache.Ignite.Core.Tests/FutureTest.cs      |  18 +-
 .../IgniteStartStopTest.cs                      |  55 +--
 .../Apache.Ignite.Core.Tests/IgniteTestBase.cs  |  51 +--
 .../Apache.Ignite.Core.Tests/LifecycleTest.cs   |  45 +-
 .../Apache.Ignite.Core.Tests/LoadDllTest.cs     |  11 +-
 .../Apache.Ignite.Core.Tests/MessagingTest.cs   |  30 +-
 .../Impl/Binary/BinaryUtils.cs                  | 207 +++------
 48 files changed, 748 insertions(+), 1219 deletions(-)
----------------------------------------------------------------------