You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2016/12/05 14:42:11 UTC

[49/50] [abbrv] ignite git commit: Merge remote-tracking branch 'remotes/origin/master' into ignite-comm-balance-master

Merge remote-tracking branch 'remotes/origin/master' into ignite-comm-balance-master

# Conflicts:
#	modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
#	modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
#	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java
#	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicFullUpdateRequest.java
#	modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestNioListener.java
#	modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridSelectorNioSessionImpl.java
#	modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java


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

Branch: refs/heads/ignite-comm-balance-master
Commit: 822d7235075f4ed390db2fc24fbff071a47023ee
Parents: 979ecb4 31bc3bf
Author: sboikov <sb...@gridgain.com>
Authored: Mon Dec 5 17:39:44 2016 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Dec 5 17:39:44 2016 +0300

----------------------------------------------------------------------
 README.md                                       |    8 +
 bin/ignite.bat                                  |    5 +
 examples/pom-standalone-lgpl.xml                |    6 +
 examples/pom.xml                                |    6 +
 examples/redis/redis-example.php                |   82 +
 examples/redis/redis-example.py                 |   62 +
 .../examples/datagrid/SpatialQueryExample.java  |  106 ++
 .../SpatialQueryExampleMultiNodeSelfTest.java   |   31 +
 .../examples/SpatialQueryExampleSelfTest.java   |   33 +
 .../IgniteLgplExamplesSelfTestSuite.java        |    4 +
 modules/cassandra/README.txt                    |    8 +-
 modules/cassandra/licenses/apache-2.0.txt       |  202 ---
 modules/cassandra/pom.xml                       |  315 +---
 modules/cassandra/serializers/README.txt        |   33 +
 .../serializers/licenses/apache-2.0.txt         |  202 +++
 modules/cassandra/serializers/pom.xml           |  129 ++
 .../cassandra/serializer/KryoSerializer.java    |   95 ++
 .../apache/ignite/tests/KryoSerializerTest.java |   70 +
 .../java/org/apache/ignite/tests/MyPojo.java    |  102 ++
 .../store/cassandra/CassandraCacheStore.java    |  409 -----
 .../cassandra/CassandraCacheStoreFactory.java   |  200 ---
 .../store/cassandra/common/CassandraHelper.java |  133 --
 .../cassandra/common/PropertyMappingHelper.java |  220 ---
 .../store/cassandra/common/RandomSleeper.java   |  104 --
 .../store/cassandra/common/SystemHelper.java    |   46 -
 .../store/cassandra/common/package-info.java    |   21 -
 .../store/cassandra/datasource/Credentials.java |   37 -
 .../store/cassandra/datasource/DataSource.java  |  550 -------
 .../cassandra/datasource/PlainCredentials.java  |   50 -
 .../cassandra/datasource/package-info.java      |   21 -
 .../cache/store/cassandra/package-info.java     |   21 -
 .../persistence/KeyPersistenceSettings.java     |  274 ----
 .../KeyValuePersistenceSettings.java            |  478 ------
 .../persistence/PersistenceController.java      |  421 -----
 .../persistence/PersistenceSettings.java        |  335 ----
 .../persistence/PersistenceStrategy.java        |   62 -
 .../store/cassandra/persistence/PojoField.java  |  219 ---
 .../cassandra/persistence/PojoKeyField.java     |   91 --
 .../cassandra/persistence/PojoValueField.java   |  152 --
 .../persistence/ValuePersistenceSettings.java   |  107 --
 .../cassandra/persistence/package-info.java     |   21 -
 .../cassandra/serializer/JavaSerializer.java    |   81 -
 .../cassandra/serializer/KryoSerializer.java    |   93 --
 .../store/cassandra/serializer/Serializer.java  |   43 -
 .../cassandra/serializer/package-info.java      |   21 -
 .../session/BatchExecutionAssistant.java        |   95 --
 .../cassandra/session/BatchLoaderAssistant.java |   47 -
 .../cassandra/session/CassandraSession.java     |   60 -
 .../cassandra/session/CassandraSessionImpl.java |  832 ----------
 .../cassandra/session/ExecutionAssistant.java   |   77 -
 .../session/GenericBatchExecutionAssistant.java |   71 -
 .../session/LoadCacheCustomQueryWorker.java     |  105 --
 .../store/cassandra/session/package-info.java   |   21 -
 .../cassandra/session/pool/SessionPool.java     |  173 --
 .../cassandra/session/pool/SessionWrapper.java  |   71 -
 .../cassandra/session/pool/package-info.java    |   21 -
 .../store/cassandra/utils/DDLGenerator.java     |   64 -
 .../store/cassandra/utils/package-info.java     |   21 -
 .../aws/cassandra/cassandra-bootstrap.sh        |  373 -----
 .../bootstrap/aws/cassandra/cassandra-env.sh    |  283 ----
 .../bootstrap/aws/cassandra/cassandra-start.sh  |  550 -------
 .../aws/cassandra/cassandra-template.yaml       |  889 -----------
 .../bootstrap/aws/ignite/ignite-bootstrap.sh    |  384 -----
 .../ignite/ignite-cassandra-server-template.xml |  177 ---
 .../src/test/bootstrap/aws/ignite/ignite-env.sh |   25 -
 .../test/bootstrap/aws/ignite/ignite-start.sh   |  637 --------
 .../src/test/bootstrap/aws/logs-collector.sh    |  102 --
 .../tests/ignite-cassandra-client-template.xml  |  173 --
 .../test/bootstrap/aws/tests/tests-bootstrap.sh |  379 -----
 .../test/bootstrap/aws/tests/tests-report.sh    |  590 -------
 .../src/test/bootstrap/aws/tests/tests-run.sh   |  715 ---------
 .../CassandraDirectPersistenceLoadTest.java     |  107 --
 .../tests/CassandraDirectPersistenceTest.java   |  371 -----
 .../apache/ignite/tests/DDLGeneratorTest.java   |   43 -
 .../tests/IgnitePersistentStoreLoadTest.java    |  111 --
 .../ignite/tests/IgnitePersistentStoreTest.java |  369 -----
 .../org/apache/ignite/tests/load/Generator.java |   27 -
 .../apache/ignite/tests/load/IntGenerator.java  |   33 -
 .../ignite/tests/load/LoadTestDriver.java       |  238 ---
 .../apache/ignite/tests/load/LongGenerator.java |   28 -
 .../ignite/tests/load/PersonGenerator.java      |   43 -
 .../ignite/tests/load/PersonIdGenerator.java    |   31 -
 .../ignite/tests/load/StringGenerator.java      |   28 -
 .../org/apache/ignite/tests/load/Worker.java    |  429 -----
 .../tests/load/cassandra/BulkReadWorker.java    |   63 -
 .../tests/load/cassandra/BulkWriteWorker.java   |   52 -
 .../ignite/tests/load/cassandra/ReadWorker.java |   51 -
 .../tests/load/cassandra/WriteWorker.java       |   51 -
 .../tests/load/cassandra/package-info.java      |   21 -
 .../tests/load/ignite/BulkReadWorker.java       |   52 -
 .../tests/load/ignite/BulkWriteWorker.java      |   52 -
 .../ignite/tests/load/ignite/ReadWorker.java    |   51 -
 .../ignite/tests/load/ignite/WriteWorker.java   |   51 -
 .../ignite/tests/load/ignite/package-info.java  |   21 -
 .../apache/ignite/tests/load/package-info.java  |   21 -
 .../org/apache/ignite/tests/package-info.java   |   21 -
 .../org/apache/ignite/tests/pojos/Person.java   |  246 ---
 .../org/apache/ignite/tests/pojos/PersonId.java |  110 --
 .../apache/ignite/tests/pojos/package-info.java |   21 -
 .../ignite/tests/utils/CacheStoreHelper.java    |   64 -
 .../tests/utils/CassandraAdminCredentials.java  |   36 -
 .../ignite/tests/utils/CassandraHelper.java     |  358 -----
 .../tests/utils/CassandraLifeCycleBean.java     |  149 --
 .../utils/CassandraRegularCredentials.java      |   36 -
 .../ignite/tests/utils/TestCacheSession.java    |   91 --
 .../apache/ignite/tests/utils/TestsHelper.java  |  375 -----
 .../apache/ignite/tests/utils/package-info.java |   21 -
 .../src/test/resources/log4j.properties         |  119 --
 .../tests/cassandra/connection-settings.xml     |   48 -
 .../tests/cassandra/connection.properties       |   17 -
 .../tests/cassandra/credentials.properties      |   22 -
 .../tests/cassandra/embedded-cassandra.yaml     |  119 --
 .../ignite/tests/cassandra/keyspaces.properties |   17 -
 .../tests/persistence/blob/ignite-config.xml    |  100 --
 .../persistence/blob/persistence-settings-1.xml |   21 -
 .../persistence/blob/persistence-settings-2.xml |   21 -
 .../persistence/blob/persistence-settings-3.xml |   29 -
 .../tests/persistence/pojo/ignite-config.xml    |  119 --
 .../persistence/pojo/persistence-settings-1.xml |   21 -
 .../persistence/pojo/persistence-settings-2.xml |   21 -
 .../persistence/pojo/persistence-settings-3.xml |  173 --
 .../persistence/primitive/ignite-config.xml     |  100 --
 .../primitive/ignite-remote-client-config.xml   |   95 --
 .../primitive/ignite-remote-server-config.xml   |  106 --
 .../primitive/persistence-settings-1.xml        |   21 -
 .../primitive/persistence-settings-2.xml        |   21 -
 .../src/test/resources/tests.properties         |   50 -
 .../src/test/scripts/cassandra-load-tests.bat   |   41 -
 .../src/test/scripts/cassandra-load-tests.sh    |   39 -
 .../src/test/scripts/ignite-load-tests.bat      |   41 -
 .../src/test/scripts/ignite-load-tests.sh       |   39 -
 modules/cassandra/src/test/scripts/jvm-opt.sh   |   21 -
 modules/cassandra/src/test/scripts/jvm-opts.bat |   24 -
 modules/cassandra/store/README.txt              |   32 +
 modules/cassandra/store/licenses/apache-2.0.txt |  202 +++
 modules/cassandra/store/pom.xml                 |  305 ++++
 .../store/cassandra/CassandraCacheStore.java    |  519 ++++++
 .../cassandra/CassandraCacheStoreFactory.java   |  200 +++
 .../store/cassandra/common/CassandraHelper.java |  176 +++
 .../cassandra/common/PropertyMappingHelper.java |  219 +++
 .../store/cassandra/common/RandomSleeper.java   |  104 ++
 .../store/cassandra/common/SystemHelper.java    |   46 +
 .../store/cassandra/common/package-info.java    |   21 +
 .../store/cassandra/datasource/Credentials.java |   39 +
 .../store/cassandra/datasource/DataSource.java  |  647 ++++++++
 .../cassandra/datasource/PlainCredentials.java  |   53 +
 .../cassandra/datasource/package-info.java      |   21 +
 .../cache/store/cassandra/package-info.java     |   21 +
 .../persistence/KeyPersistenceSettings.java     |  305 ++++
 .../KeyValuePersistenceSettings.java            |  526 +++++++
 .../persistence/PersistenceController.java      |  462 ++++++
 .../persistence/PersistenceSettings.java        |  446 ++++++
 .../persistence/PersistenceStrategy.java        |   62 +
 .../store/cassandra/persistence/PojoField.java  |  245 +++
 .../cassandra/persistence/PojoKeyField.java     |   87 +
 .../cassandra/persistence/PojoValueField.java   |  143 ++
 .../persistence/ValuePersistenceSettings.java   |  120 ++
 .../cassandra/persistence/package-info.java     |   21 +
 .../cassandra/serializer/JavaSerializer.java    |   80 +
 .../store/cassandra/serializer/Serializer.java  |   43 +
 .../cassandra/serializer/package-info.java      |   21 +
 .../session/BatchExecutionAssistant.java        |  102 ++
 .../cassandra/session/BatchLoaderAssistant.java |   47 +
 .../cassandra/session/CassandraSession.java     |   70 +
 .../cassandra/session/CassandraSessionImpl.java |  943 +++++++++++
 .../cassandra/session/ExecutionAssistant.java   |   84 +
 .../session/GenericBatchExecutionAssistant.java |   71 +
 .../session/LoadCacheCustomQueryWorker.java     |  105 ++
 .../store/cassandra/session/package-info.java   |   21 +
 .../cassandra/session/pool/SessionPool.java     |  173 ++
 .../cassandra/session/pool/SessionWrapper.java  |   71 +
 .../cassandra/session/pool/package-info.java    |   21 +
 .../session/transaction/BaseMutation.java       |   68 +
 .../session/transaction/DeleteMutation.java     |   57 +
 .../cassandra/session/transaction/Mutation.java |   63 +
 .../session/transaction/WriteMutation.java      |   60 +
 .../session/transaction/package-info.java       |   21 +
 .../store/cassandra/utils/DDLGenerator.java     |   76 +
 .../store/cassandra/utils/package-info.java     |   21 +
 .../store/src/test/bootstrap/aws/README.txt     |   13 +
 .../aws/cassandra/cassandra-bootstrap.sh        |  336 ++++
 .../bootstrap/aws/cassandra/cassandra-env.sh    |  287 ++++
 .../bootstrap/aws/cassandra/cassandra-start.sh  |  217 +++
 .../aws/cassandra/cassandra-template.yaml       |  888 +++++++++++
 .../store/src/test/bootstrap/aws/common.sh      | 1481 ++++++++++++++++++
 .../store/src/test/bootstrap/aws/env.sh         |  113 ++
 .../test/bootstrap/aws/ganglia/agent-start.sh   |   75 +
 .../bootstrap/aws/ganglia/ganglia-bootstrap.sh  |  417 +++++
 .../bootstrap/aws/ignite/ignite-bootstrap.sh    |  336 ++++
 .../ignite/ignite-cassandra-server-template.xml |  190 +++
 .../src/test/bootstrap/aws/ignite/ignite-env.sh |   29 +
 .../test/bootstrap/aws/ignite/ignite-start.sh   |  266 ++++
 .../src/test/bootstrap/aws/logs-collector.sh    |  173 ++
 .../tests/ignite-cassandra-client-template.xml  |  192 +++
 .../test/bootstrap/aws/tests/tests-bootstrap.sh |  317 ++++
 .../test/bootstrap/aws/tests/tests-manager.sh   |  458 ++++++
 .../test/bootstrap/aws/tests/tests-report.sh    |  499 ++++++
 .../CassandraDirectPersistenceLoadTest.java     |  107 ++
 .../tests/CassandraDirectPersistenceTest.java   |  696 ++++++++
 .../ignite/tests/CassandraLocalServer.java      |   59 +
 .../apache/ignite/tests/DDLGeneratorTest.java   |   57 +
 .../tests/DatasourceSerializationTest.java      |  158 ++
 .../tests/IgnitePersistentStoreLoadTest.java    |  111 ++
 .../ignite/tests/IgnitePersistentStoreTest.java |  666 ++++++++
 .../LoadTestsCassandraArtifactsCreator.java     |  104 ++
 .../org/apache/ignite/tests/load/Generator.java |   27 +
 .../apache/ignite/tests/load/IntGenerator.java  |   33 +
 .../ignite/tests/load/LoadTestDriver.java       |  238 +++
 .../apache/ignite/tests/load/LongGenerator.java |   28 +
 .../ignite/tests/load/PersonGenerator.java      |   43 +
 .../ignite/tests/load/PersonIdGenerator.java    |   31 +
 .../ignite/tests/load/StringGenerator.java      |   28 +
 .../org/apache/ignite/tests/load/Worker.java    |  429 +++++
 .../tests/load/cassandra/BulkReadWorker.java    |   63 +
 .../tests/load/cassandra/BulkWriteWorker.java   |   52 +
 .../ignite/tests/load/cassandra/ReadWorker.java |   51 +
 .../tests/load/cassandra/WriteWorker.java       |   51 +
 .../tests/load/cassandra/package-info.java      |   21 +
 .../tests/load/ignite/BulkReadWorker.java       |   52 +
 .../tests/load/ignite/BulkWriteWorker.java      |   52 +
 .../ignite/tests/load/ignite/ReadWorker.java    |   51 +
 .../ignite/tests/load/ignite/WriteWorker.java   |   51 +
 .../ignite/tests/load/ignite/package-info.java  |   21 +
 .../apache/ignite/tests/load/package-info.java  |   21 +
 .../org/apache/ignite/tests/package-info.java   |   21 +
 .../org/apache/ignite/tests/pojos/Person.java   |  279 ++++
 .../org/apache/ignite/tests/pojos/PersonId.java |  110 ++
 .../org/apache/ignite/tests/pojos/Product.java  |  123 ++
 .../apache/ignite/tests/pojos/ProductOrder.java |  148 ++
 .../apache/ignite/tests/pojos/package-info.java |   21 +
 .../ignite/tests/utils/CacheStoreHelper.java    |   77 +
 .../tests/utils/CassandraAdminCredentials.java  |   38 +
 .../ignite/tests/utils/CassandraHelper.java     |  358 +++++
 .../tests/utils/CassandraLifeCycleBean.java     |  149 ++
 .../utils/CassandraRegularCredentials.java      |   38 +
 .../ignite/tests/utils/TestCacheSession.java    |   95 ++
 .../ignite/tests/utils/TestTransaction.java     |  132 ++
 .../apache/ignite/tests/utils/TestsHelper.java  |  660 ++++++++
 .../apache/ignite/tests/utils/package-info.java |   21 +
 .../store/src/test/resources/log4j.properties   |  119 ++
 .../tests/cassandra/connection-settings.xml     |   52 +
 .../tests/cassandra/connection.properties       |   17 +
 .../tests/cassandra/credentials.properties      |   22 +
 .../tests/cassandra/embedded-cassandra.yaml     |  119 ++
 .../ignite/tests/cassandra/keyspaces.properties |   17 +
 .../tests/persistence/blob/ignite-config.xml    |   94 ++
 .../persistence/blob/persistence-settings-1.xml |   21 +
 .../persistence/blob/persistence-settings-2.xml |   21 +
 .../persistence/blob/persistence-settings-3.xml |   29 +
 .../tests/persistence/pojo/ignite-config.xml    |  169 ++
 .../ignite/tests/persistence/pojo/order.xml     |   21 +
 .../persistence/pojo/persistence-settings-1.xml |   21 +
 .../persistence/pojo/persistence-settings-2.xml |   21 +
 .../persistence/pojo/persistence-settings-3.xml |  175 +++
 .../persistence/pojo/persistence-settings-4.xml |  175 +++
 .../ignite/tests/persistence/pojo/product.xml   |   21 +
 .../persistence/primitive/ignite-config.xml     |   94 ++
 .../primitive/ignite-remote-client-config.xml   |   99 ++
 .../primitive/ignite-remote-server-config.xml   |  110 ++
 .../primitive/persistence-settings-1.xml        |   21 +
 .../primitive/persistence-settings-2.xml        |   21 +
 .../store/src/test/resources/tests.properties   |   65 +
 .../src/test/scripts/cassandra-load-tests.bat   |   41 +
 .../src/test/scripts/cassandra-load-tests.sh    |   39 +
 .../src/test/scripts/ignite-load-tests.bat      |   41 +
 .../store/src/test/scripts/ignite-load-tests.sh |   39 +
 .../cassandra/store/src/test/scripts/jvm-opt.sh |   21 +
 .../store/src/test/scripts/jvm-opts.bat         |   24 +
 .../scripts/recreate-cassandra-artifacts.bat    |   41 +
 .../scripts/recreate-cassandra-artifacts.sh     |   39 +
 modules/clients/pom.xml                         |   17 +-
 .../client/suite/IgniteClientTestSuite.java     |    4 +
 .../internal/jdbc2/JdbcResultSetSelfTest.java   |    4 +-
 .../rest/RestProcessorMultiStartSelfTest.java   |   48 +-
 .../tcp/redis/RedisProtocolSelfTest.java        |  486 ++++++
 .../ignite/jdbc/JdbcResultSetSelfTest.java      |    4 +-
 .../src/main/java/org/apache/ignite/Ignite.java |   77 +-
 .../java/org/apache/ignite/IgniteCache.java     |   21 +-
 .../org/apache/ignite/IgniteDataStreamer.java   |    2 +-
 .../java/org/apache/ignite/IgniteServices.java  |   48 +-
 .../apache/ignite/IgniteSystemProperties.java   |   26 +
 .../affinity/fair/FairAffinityFunction.java     |    8 +-
 .../rendezvous/RendezvousAffinityFunction.java  |    6 +-
 .../ignite/cache/query/QueryDetailMetrics.java  |   98 ++
 .../apache/ignite/cache/query/QueryMetrics.java |    2 +-
 .../store/jdbc/CacheAbstractJdbcStore.java      |    2 +-
 .../store/jdbc/dialect/BasicJdbcDialect.java    |    4 +-
 .../cache/store/jdbc/dialect/DB2Dialect.java    |    8 +
 .../cache/store/jdbc/dialect/OracleDialect.java |    8 +
 .../store/jdbc/dialect/SQLServerDialect.java    |    8 +
 .../configuration/CacheConfiguration.java       |   30 +
 .../internal/ComputeTaskInternalFuture.java     |   11 +
 .../apache/ignite/internal/IgniteKernal.java    |   95 +-
 .../ignite/internal/IgniteServicesImpl.java     |    4 +-
 .../org/apache/ignite/internal/IgnitionEx.java  |   32 +-
 .../ignite/internal/MarshallerContextImpl.java  |    7 +-
 .../internal/binary/BinaryClassDescriptor.java  |   43 +-
 .../ignite/internal/binary/BinaryContext.java   |   17 +-
 .../internal/binary/BinaryObjectExImpl.java     |   57 +-
 .../internal/binary/BinaryObjectImpl.java       |   23 +
 .../binary/BinaryObjectOffheapImpl.java         |   24 +-
 .../ignite/internal/binary/BinaryUtils.java     |    4 +
 .../binary/builder/BinaryObjectBuilderImpl.java |    6 +-
 .../internal/cluster/IgniteClusterImpl.java     |    9 +-
 .../ignite/internal/jdbc/JdbcResultSet.java     |   10 +-
 .../ignite/internal/jdbc2/JdbcResultSet.java    |    9 +-
 .../communication/GridIoMessageFactory.java     |   32 +-
 .../GridDeploymentPerVersionStore.java          |    2 +-
 .../discovery/GridDiscoveryManager.java         |    2 +-
 .../eventstorage/GridEventStorageManager.java   |    2 +-
 .../processors/affinity/AffinityAssignment.java |   88 ++
 .../affinity/GridAffinityAssignment.java        |    8 +-
 .../affinity/GridAffinityAssignmentCache.java   |   35 +-
 .../affinity/GridAffinityProcessor.java         |   89 +-
 .../processors/affinity/GridAffinityUtils.java  |    8 +-
 .../affinity/HistoryAffinityAssignment.java     |  169 ++
 .../cache/CacheAffinitySharedManager.java       |   57 +-
 .../processors/cache/CacheLockCandidates.java   |   42 +
 .../cache/CacheLockCandidatesList.java          |   71 +
 .../cache/DynamicCacheChangeBatch.java          |    7 +
 .../processors/cache/GridCacheAdapter.java      |   11 +-
 .../cache/GridCacheAffinityManager.java         |    6 +-
 .../cache/GridCacheClearAllRunnable.java        |   58 +-
 .../processors/cache/GridCacheContext.java      |    8 +
 .../cache/GridCacheDeploymentManager.java       |    4 +-
 .../processors/cache/GridCacheEntryEx.java      |    7 +-
 .../processors/cache/GridCacheEventManager.java |   10 +-
 .../processors/cache/GridCacheIoManager.java    |   89 +-
 .../processors/cache/GridCacheMapEntry.java     |  126 +-
 .../processors/cache/GridCacheMvcc.java         |  376 +++--
 .../processors/cache/GridCacheMvccCallback.java |    4 +-
 .../cache/GridCacheMvccCandidate.java           |   80 +-
 .../processors/cache/GridCacheMvccManager.java  |   96 +-
 .../GridCachePartitionExchangeManager.java      |  299 +++-
 .../processors/cache/GridCachePreloader.java    |   11 +
 .../cache/GridCachePreloaderAdapter.java        |    7 +
 .../processors/cache/GridCacheProcessor.java    |  306 +++-
 .../cache/GridCacheSharedContext.java           |    1 +
 .../processors/cache/GridCacheSwapManager.java  |   22 +-
 .../processors/cache/GridCacheUtilityKey.java   |    6 +-
 .../processors/cache/GridCacheUtils.java        |   67 -
 .../processors/cache/IgniteCacheProxy.java      |   59 +-
 .../distributed/GridCacheTxRecoveryFuture.java  |    6 +-
 .../distributed/GridDistributedCacheEntry.java  |  303 +---
 .../dht/GridClientPartitionTopology.java        |   33 +-
 .../distributed/dht/GridDhtCacheEntry.java      |   32 +-
 .../cache/distributed/dht/GridDhtGetFuture.java |    4 +-
 .../distributed/dht/GridDhtLocalPartition.java  |    7 +-
 .../distributed/dht/GridDhtLockFuture.java      |   58 +-
 .../dht/GridDhtPartitionTopology.java           |    3 +-
 .../dht/GridDhtPartitionTopologyImpl.java       |   31 +-
 .../dht/GridDhtTransactionalCacheAdapter.java   |    1 -
 .../distributed/dht/GridDhtTxPrepareFuture.java |   29 +-
 .../GridDhtAtomicAbstractUpdateFuture.java      |  471 ++++++
 .../GridDhtAtomicAbstractUpdateRequest.java     |  287 ++++
 .../dht/atomic/GridDhtAtomicCache.java          |  148 +-
 .../atomic/GridDhtAtomicSingleUpdateFuture.java |  190 +++
 .../GridDhtAtomicSingleUpdateRequest.java       |  678 ++++++++
 .../dht/atomic/GridDhtAtomicUpdateFuture.java   |  423 +----
 .../dht/atomic/GridDhtAtomicUpdateRequest.java  |  312 ++--
 ...idNearAtomicAbstractSingleUpdateRequest.java |  562 +++++++
 .../GridNearAtomicAbstractUpdateFuture.java     |   15 +-
 .../GridNearAtomicAbstractUpdateRequest.java    |  226 +++
 .../atomic/GridNearAtomicFullUpdateRequest.java | 1025 ++++++++++++
 ...GridNearAtomicSingleUpdateFilterRequest.java |  226 +++
 .../GridNearAtomicSingleUpdateFuture.java       |  135 +-
 ...GridNearAtomicSingleUpdateInvokeRequest.java |  306 ++++
 .../GridNearAtomicSingleUpdateRequest.java      |  355 +++++
 .../dht/atomic/GridNearAtomicUpdateFuture.java  |   42 +-
 .../dht/atomic/GridNearAtomicUpdateRequest.java | 1097 -------------
 .../colocated/GridDhtColocatedLockFuture.java   |   20 +-
 .../dht/preloader/GridDhtPartitionFullMap.java  |   18 +
 .../dht/preloader/GridDhtPartitionMap2.java     |   53 +-
 .../GridDhtPartitionsAbstractMessage.java       |   40 +-
 .../GridDhtPartitionsExchangeFuture.java        |   84 +-
 .../preloader/GridDhtPartitionsFullMessage.java |  150 +-
 .../GridDhtPartitionsSingleMessage.java         |  132 +-
 .../GridDhtPartitionsSingleRequest.java         |    4 +-
 .../dht/preloader/GridDhtPreloader.java         |   42 +-
 .../distributed/near/GridNearAtomicCache.java   |   18 +-
 .../distributed/near/GridNearCacheEntry.java    |   44 +-
 .../distributed/near/GridNearLockFuture.java    |   15 +-
 ...arOptimisticSerializableTxPrepareFuture.java |    6 +-
 .../near/GridNearOptimisticTxPrepareFuture.java |   18 +-
 .../GridNearPessimisticTxPrepareFuture.java     |    6 +-
 .../near/GridNearTransactionalCache.java        |    5 +-
 .../near/GridNearTxFinishFuture.java            |    6 +-
 .../cache/local/GridLocalCacheEntry.java        |  173 +-
 .../cache/local/GridLocalLockFuture.java        |    2 +-
 .../processors/cache/query/CacheQuery.java      |    1 -
 .../processors/cache/query/CacheQueryType.java  |    2 +-
 .../cache/query/GridCacheQueryAdapter.java      |   10 -
 .../GridCacheQueryDetailMetricsAdapter.java     |  248 +++
 .../query/GridCacheQueryDetailMetricsKey.java   |   82 +
 .../query/GridCacheQueryFutureAdapter.java      |    2 -
 .../cache/query/GridCacheQueryManager.java      |  167 +-
 .../query/GridCacheQueryMetricsAdapter.java     |   29 +-
 .../continuous/CacheContinuousQueryHandler.java |    4 +-
 .../CacheContinuousQueryListener.java           |    4 +-
 .../continuous/CacheContinuousQueryManager.java |    6 +-
 .../store/GridCacheStoreManagerAdapter.java     |    2 +-
 .../cache/store/GridCacheWriteBehindStore.java  |    2 +-
 .../cache/transactions/IgniteTxHandler.java     |    2 +-
 .../cache/transactions/IgniteTxManager.java     |    6 +-
 .../GridCacheLazyPlainVersionedEntry.java       |    6 +
 .../version/GridCachePlainVersionedEntry.java   |    5 +-
 .../clock/GridClockSyncProcessor.java           |    2 +-
 .../continuous/GridContinuousProcessor.java     |    4 +-
 .../datastreamer/DataStreamProcessor.java       |  104 +-
 .../datastreamer/DataStreamerImpl.java          |  607 +++++--
 .../datastructures/GridCacheQueueAdapter.java   |    2 +-
 .../igfs/IgfsFragmentizerManager.java           |   29 +-
 .../internal/processors/igfs/IgfsImpl.java      |   33 +-
 .../internal/processors/igfs/IgfsProcessor.java |   15 +
 .../OsDiscoveryNodeValidationProcessor.java     |    2 +-
 .../processors/odbc/OdbcRequestHandler.java     |   32 +-
 .../offheap/GridOffHeapProcessor.java           |   14 +
 .../platform/PlatformAbstractTarget.java        |   65 +-
 .../platform/PlatformConfigurationEx.java       |    9 +-
 .../platform/PlatformNoopProcessor.java         |    5 +
 .../processors/platform/PlatformProcessor.java  |    7 +
 .../platform/PlatformProcessorImpl.java         |   21 +-
 .../processors/platform/PlatformTarget.java     |   20 -
 .../binary/PlatformBinaryProcessor.java         |   96 ++
 .../platform/cache/PlatformCache.java           |  282 ++--
 .../cache/affinity/PlatformAffinity.java        |    4 +-
 .../affinity/PlatformAffinityFunction.java      |    7 +-
 .../cache/expiry/PlatformExpiryPolicy.java      |   93 ++
 .../expiry/PlatformExpiryPolicyFactory.java     |   76 +
 .../query/PlatformAbstractQueryCursor.java      |    4 +-
 .../query/PlatformContinuousQueryProxy.java     |    3 +-
 .../platform/cluster/PlatformClusterGroup.java  |   41 +-
 .../platform/compute/PlatformCompute.java       |    9 +-
 .../cpp/PlatformCppConfigurationEx.java         |    4 +-
 .../datastreamer/PlatformDataStreamer.java      |    9 +-
 .../datastructures/PlatformAtomicLong.java      |   27 +-
 .../datastructures/PlatformAtomicReference.java |    8 +-
 .../datastructures/PlatformAtomicSequence.java  |   31 +-
 .../dotnet/PlatformDotNetConfigurationEx.java   |   10 +-
 ...PlatformDotNetEntityFrameworkCacheEntry.java |  102 ++
 ...formDotNetEntityFrameworkCacheExtension.java |  353 +++++
 .../PlatformDotNetEntityFrameworkCacheKey.java  |  164 ++
 ...EntityFrameworkIncreaseVersionProcessor.java |   45 +
 .../platform/services/PlatformServices.java     |   13 +-
 .../transactions/PlatformTransactions.java      |   17 +-
 .../utils/PlatformConfigurationUtils.java       |  161 +-
 .../processors/query/GridQueryProcessor.java    |  102 +-
 .../processors/rest/GridRestProcessor.java      |   15 +
 .../handlers/query/QueryCommandHandler.java     |   16 +-
 .../handlers/redis/GridRedisCommandHandler.java |   39 +
 .../GridRedisConnectionCommandHandler.java      |   74 +
 .../redis/GridRedisRestCommandHandler.java      |  102 ++
 .../exception/GridRedisGenericException.java    |   37 +
 .../redis/exception/GridRedisTypeException.java |   37 +
 .../redis/key/GridRedisDelCommandHandler.java   |   95 ++
 .../key/GridRedisExistsCommandHandler.java      |   94 ++
 .../server/GridRedisDbSizeCommandHandler.java   |   80 +
 .../string/GridRedisAppendCommandHandler.java   |  118 ++
 .../string/GridRedisGetCommandHandler.java      |   86 +
 .../string/GridRedisGetRangeCommandHandler.java |  128 ++
 .../string/GridRedisGetSetCommandHandler.java   |   94 ++
 .../string/GridRedisIncrDecrCommandHandler.java |  142 ++
 .../string/GridRedisMGetCommandHandler.java     |   94 ++
 .../string/GridRedisMSetCommandHandler.java     |   91 ++
 .../string/GridRedisSetCommandHandler.java      |  134 ++
 .../string/GridRedisSetRangeCommandHandler.java |  149 ++
 .../string/GridRedisStrlenCommandHandler.java   |   89 ++
 .../protocols/tcp/GridClientPacketType.java     |    3 +
 .../protocols/tcp/GridTcpRestNioListener.java   |   14 +-
 .../rest/protocols/tcp/GridTcpRestParser.java   |   39 +-
 .../protocols/tcp/redis/GridRedisCommand.java   |   80 +
 .../protocols/tcp/redis/GridRedisMessage.java   |  219 +++
 .../tcp/redis/GridRedisNioListener.java         |  146 ++
 .../tcp/redis/GridRedisProtocolParser.java      |  314 ++++
 .../rest/request/RestQueryRequest.java          |    2 +-
 .../processors/task/GridTaskWorker.java         |    2 +-
 .../internal/util/GridBoundedPriorityQueue.java |   68 +
 .../ignite/internal/util/GridJavaProcess.java   |    5 +-
 .../ignite/internal/util/GridLogThrottle.java   |   66 +-
 .../apache/ignite/internal/util/GridUnsafe.java |    9 +-
 .../ignite/internal/util/IgniteUtils.java       |  117 +-
 .../util/future/GridCompoundFuture.java         |  100 +-
 .../internal/util/future/GridFutureAdapter.java |   12 +-
 .../ipc/shmem/IpcSharedMemoryNativeLoader.java  |    2 +-
 .../shmem/IpcSharedMemoryServerEndpoint.java    |    4 +-
 .../nio/GridConnectionBytesVerifyFilter.java    |    2 +-
 .../internal/util/nio/GridNioCodecFilter.java   |    2 +-
 .../internal/util/nio/GridNioFilterChain.java   |    2 +-
 .../ignite/internal/util/nio/GridNioServer.java |    2 +-
 .../util/nio/GridSelectorNioSessionImpl.java    |    2 +-
 .../util/offheap/unsafe/GridUnsafeLru.java      |   30 +-
 .../util/offheap/unsafe/GridUnsafeMemory.java   |   33 +-
 .../cache/VisorCacheQueryDetailMetrics.java     |  167 ++
 ...sorCacheQueryDetailMetricsCollectorTask.java |  146 ++
 .../VisorCacheResetQueryDetailMetricsTask.java  |   71 +
 .../cache/VisorCacheResetQueryMetricsTask.java  |    8 +-
 .../visor/misc/VisorResolveHostNameTask.java    |    4 +-
 .../internal/visor/util/VisorTaskUtils.java     |   26 +-
 .../ignite/marshaller/jdk/JdkMarshaller.java    |    4 +-
 .../optimized/OptimizedMarshaller.java          |    8 +-
 .../dotnet/PlatformDotNetAffinityFunction.java  |    9 +-
 .../security/SecurityBasicPermissionSet.java    |  107 ++
 .../security/SecurityPermissionSetBuilder.java  |  222 +++
 .../org/apache/ignite/services/Service.java     |   12 +-
 .../communication/tcp/TcpCommunicationSpi.java  |   12 +-
 .../ignite/spi/discovery/tcp/ClientImpl.java    |   45 +-
 .../ignite/spi/discovery/tcp/ServerImpl.java    |  548 +++++--
 .../spi/discovery/tcp/TcpDiscoveryImpl.java     |   61 +-
 .../spi/discovery/tcp/TcpDiscoverySpi.java      |    8 +-
 .../TcpDiscoveryMulticastIpFinder.java          |    4 +-
 .../messages/TcpDiscoveryAbstractMessage.java   |    7 +
 .../messages/TcpDiscoveryClientAckResponse.java |    5 +
 .../TcpDiscoveryClientHeartbeatMessage.java     |    7 +-
 .../TcpDiscoveryConnectionCheckMessage.java     |    5 +
 .../messages/TcpDiscoveryHeartbeatMessage.java  |    5 +
 .../TcpDiscoveryNodeAddFinishedMessage.java     |   11 +
 .../messages/TcpDiscoveryNodeAddedMessage.java  |   33 +-
 .../spi/swapspace/file/FileSwapSpaceSpi.java    |   53 +-
 .../resources/META-INF/classnames.properties    |   86 +-
 .../AbstractAffinityFunctionSelfTest.java       |   18 +-
 .../IgniteLocalNodeMapBeforeStartTest.java      |   82 +
 .../binary/BinaryMarshallerSelfTest.java        |  343 +++-
 .../CacheAtomicSingleMessageCountSelfTest.java  |  259 +++
 ...CacheExchangeMessageDuplicatedStateTest.java |  393 +++++
 .../CacheSerializableTransactionsTest.java      |  604 ++++++-
 .../cache/GridCacheAbstractFullApiSelfTest.java |   36 +-
 .../GridCacheAtomicMessageCountSelfTest.java    |   24 +-
 .../cache/GridCacheMvccFlagsTest.java           |    8 +-
 .../cache/GridCacheMvccPartitionedSelfTest.java |  334 +++-
 .../processors/cache/GridCacheMvccSelfTest.java |  212 +--
 .../cache/GridCacheOffHeapCleanupTest.java      |  169 ++
 .../cache/GridCacheSwapCleanupTest.java         |   99 ++
 .../processors/cache/GridCacheTestEntryEx.java  |   81 +-
 .../IgniteCacheAtomicStopBusySelfTest.java      |   10 +-
 .../cache/IgniteCacheCreateRestartSelfTest.java |    2 -
 .../cache/IgniteCacheDynamicStopSelfTest.java   |   48 +-
 .../IgniteCacheP2pUnmarshallingErrorTest.java   |    2 +-
 .../cache/IgniteCachePeekModesAbstractTest.java |    2 +-
 .../cache/IgniteDynamicCacheStartSelfTest.java  |  217 ++-
 .../cache/OffheapCacheOnClientsTest.java        |  143 ++
 .../cache/WithKeepBinaryCacheFullApiTest.java   |   10 +-
 .../GridCacheQueueApiSelfAbstractTest.java      |   66 +
 ...SemaphoreFailoverSafeReleasePermitsTest.java |  129 ++
 ...CacheLoadingConcurrentGridStartSelfTest.java |  255 ++-
 ...ncurrentGridStartSelfTestAllowOverwrite.java |   30 +
 ...niteCacheClientNodeChangingTopologyTest.java |   22 +-
 .../distributed/IgniteCacheGetRestartTest.java  |    3 +
 ...artitionedBackupNodeFailureRecoveryTest.java |  193 +++
 ...eAtomicInvalidPartitionHandlingSelfTest.java |    2 +-
 .../rebalancing/CacheNodeSafeAssertion.java     |  118 ++
 ...cingDelayedPartitionMapExchangeSelfTest.java |    8 +-
 .../GridCacheRebalancingOrderingTest.java       |  916 +++++++++++
 ...cheRebalancingPartitionDistributionTest.java |  149 ++
 .../GridCacheRebalancingSyncSelfTest.java       |   18 +-
 .../GridCacheSyncReplicatedPreloadSelfTest.java |    3 -
 .../IgniteCacheSyncRebalanceModeSelfTest.java   |    2 +-
 ...ContinuousQueryFailoverAbstractSelfTest.java |    2 +-
 ...teCacheContinuousQueryNoUnsubscribeTest.java |  153 ++
 ...ComputeJobExecutionErrorToLogManualTest.java |   88 ++
 .../compute/PublicThreadpoolStarvationTest.java |  123 ++
 .../IgniteNoCustomEventsOnNodeStart.java        |    7 +
 .../DataStreamProcessorSelfTest.java            |    4 +-
 .../datastreamer/DataStreamerImplSelfTest.java  |  170 +-
 .../DataStreamerMultiThreadedSelfTest.java      |    2 -
 .../datastreamer/DataStreamerTimeoutTest.java   |   92 +-
 .../processors/igfs/IgfsIgniteMock.java         |   19 +
 .../igfs/IgfsProcessorValidationSelfTest.java   |   30 +
 ...IpcEndpointRegistrationAbstractSelfTest.java |   76 +-
 ...dpointRegistrationOnLinuxAndMacSelfTest.java |   11 +-
 .../query/GridQueryCommandHandlerTest.java      |  191 +++
 .../utils/GridBoundedPriorityQueueSelfTest.java |  114 ++
 .../loadtests/hashmap/GridHashMapLoadTest.java  |    7 +-
 .../marshaller/MarshallerContextSelfTest.java   |   90 ++
 .../platform/PlatformCacheWriteMetricsTask.java |  463 ++++++
 .../SecurityPermissionSetBuilderTest.java       |  110 ++
 .../spi/discovery/tcp/TcpDiscoverySelfTest.java |  134 +-
 .../ignite/testframework/GridTestUtils.java     |    2 +-
 .../assertions/AlwaysAssertion.java             |   29 +
 .../testframework/assertions/Assertion.java     |   31 +
 .../testframework/assertions/package-info.java  |   22 +
 .../testframework/junits/GridAbstractTest.java  |   10 +-
 .../ignite/testframework/junits/IgniteMock.java |   15 +
 .../junits/common/GridCommonAbstractTest.java   |   33 +-
 .../common/GridRollingRestartAbstractTest.java  |  324 ++++
 .../multijvm/IgniteCacheProcessProxy.java       |   16 +
 .../junits/multijvm/IgniteProcessProxy.java     |   39 +-
 .../ignite/testsuites/IgniteBasicTestSuite.java |    8 +-
 .../IgniteCacheDataStructuresSelfTestSuite.java |    2 +
 .../IgniteCacheFailoverTestSuite.java           |    2 +
 .../ignite/testsuites/IgniteCacheTestSuite.java |    2 +
 .../testsuites/IgniteCacheTestSuite2.java       |    9 +
 .../testsuites/IgniteCacheTestSuite5.java       |    3 +
 .../testsuites/IgniteComputeGridTestSuite.java  |    2 +
 .../testsuites/IgniteKernalSelfTestSuite.java   |    2 +
 .../testsuites/IgniteLangSelfTestSuite.java     |    4 +-
 .../testsuites/IgniteRestHandlerTestSuite.java  |    2 +
 .../testsuites/IgniteUtilSelfTestSuite.java     |    2 +
 .../ignite/thread/IgniteThreadPoolSizeTest.java |  131 ++
 .../apache/ignite/util/GridLogThrottleTest.java |   27 +-
 modules/docker/1.7.0/Dockerfile                 |   44 +
 modules/docker/1.7.0/run.sh                     |   51 +
 modules/docker/Dockerfile                       |    2 +-
 .../apache/ignite/sink/flink/IgniteSink.java    |    2 +-
 modules/flume/README.txt                        |    2 +-
 .../h2/GridBinaryH2IndexingGeoSelfTest.java     |   35 +
 .../query/h2/GridH2IndexingGeoSelfTest.java     |    2 +-
 .../testsuites/GeoSpatialIndexingTestSuite.java |    2 +
 modules/hadoop/pom.xml                          |   49 +
 .../HadoopExternalCommunication.java            |    6 +-
 .../resources/META-INF/classnames.properties    |  114 ++
 ...opClientProtocolMultipleServersSelfTest.java |  126 +-
 .../query/h2/GridH2ResultSetIterator.java       |   62 +-
 .../processors/query/h2/IgniteH2Indexing.java   |    6 +-
 .../processors/query/h2/opt/GridH2Row.java      |    2 +-
 .../query/h2/opt/GridH2ValueCacheObject.java    |   10 +-
 .../query/h2/sql/GridSqlQuerySplitter.java      |  143 +-
 .../query/h2/twostep/GridMapQueryExecutor.java  |   34 +-
 .../query/h2/twostep/GridMergeIndex.java        |   49 +-
 .../h2/twostep/GridReduceQueryExecutor.java     |    2 +-
 ...CacheAbstractQueryDetailMetricsSelfTest.java |  572 +++++++
 .../CacheAbstractQueryMetricsSelfTest.java      |  305 ++--
 .../CacheLocalQueryDetailMetricsSelfTest.java   |   33 +
 ...edQueryDetailMetricsDistributedSelfTest.java |   33 +
 ...titionedQueryDetailMetricsLocalSelfTest.java |   33 +
 ...edQueryDetailMetricsDistributedSelfTest.java |   33 +
 ...plicatedQueryDetailMetricsLocalSelfTest.java |   33 +
 .../cache/CacheSqlQueryValueCopySelfTest.java   |  226 +++
 .../IgniteCacheAbstractFieldsQuerySelfTest.java |    2 +-
 .../cache/IgniteCacheOffheapEvictQueryTest.java |    9 +-
 .../cache/IgniteCacheQueriesLoadTest1.java      |  604 +++++++
 .../IgniteCacheQueryMultiThreadedSelfTest.java  |   59 +
 ...lientQueryReplicatedNodeRestartSelfTest.java |    7 +
 ...butedQueryStopOnCancelOrTimeoutSelfTest.java |   15 +-
 ...nCancelOrTimeoutDistributedJoinSelfTest.java |    8 +-
 .../IgniteCacheReplicatedQuerySelfTest.java     |   48 +-
 .../IgniteCacheLocalFieldsQuerySelfTest.java    |   16 +
 .../query/IgniteSqlSplitterSelfTest.java        |  328 ++++
 .../h2/GridIndexingSpiAbstractSelfTest.java     |    2 +-
 .../query/h2/sql/GridQueryParsingTest.java      |   11 +-
 .../IgniteBinaryCacheQueryTestSuite2.java       |    3 +
 .../IgniteCacheQuerySelfTestSuite2.java         |   14 +
 .../IgniteCacheQuerySelfTestSuite3.java         |    2 +
 modules/kafka/README.txt                        |    4 +
 .../kafka/connect/IgniteSinkConnector.java      |    9 +
 .../kafka/connect/IgniteSinkConstants.java      |    3 +
 .../stream/kafka/connect/IgniteSinkTask.java    |   47 +-
 .../kafka/connect/IgniteSourceConnector.java    |    9 +
 .../kafka/connect/IgniteSinkConnectorMock.java  |   30 +
 .../kafka/connect/IgniteSinkConnectorTest.java  |   99 +-
 .../kafka/connect/IgniteSinkTaskMock.java       |   29 +
 .../connect/IgniteSourceConnectorTest.java      |   14 +-
 .../osgi-karaf/src/main/resources/features.xml  |   12 +-
 modules/platforms/cpp/DEVNOTES.txt              |   23 +-
 modules/platforms/cpp/README.txt                |   10 +-
 modules/platforms/cpp/binary/Makefile.am        |    4 +-
 .../ignite/impl/binary/binary_type_manager.h    |   14 +-
 .../cpp/binary/project/vs/binary.vcxproj        |    2 -
 .../src/impl/binary/binary_reader_impl.cpp      |    3 +-
 .../cpp/common/project/vs/common.vcxproj        |    1 -
 modules/platforms/cpp/core/Makefile.am          |    4 +-
 .../impl/binary/binary_type_updater_impl.h      |   12 +-
 .../include/ignite/impl/ignite_environment.h    |   49 +-
 .../platforms/cpp/core/project/vs/core.vcxproj  |    2 -
 modules/platforms/cpp/core/src/ignition.cpp     |    8 +-
 .../impl/binary/binary_type_updater_impl.cpp    |   13 +-
 .../core/src/impl/cache/query/query_impl.cpp    |    6 +-
 .../cpp/core/src/impl/ignite_environment.cpp    |   45 +-
 .../core/src/impl/interop/interop_target.cpp    |    6 +-
 modules/platforms/cpp/examples/README.txt       |    9 +-
 .../cpp/examples/odbc-example/Makefile.am       |    4 +-
 .../cpp/examples/putget-example/Makefile.am     |    4 +-
 .../putget-example/src/putget_example.cpp       |    2 +-
 .../cpp/examples/query-example/Makefile.am      |    4 +-
 .../query-example/src/query_example.cpp         |    2 +-
 modules/platforms/cpp/ignite/Makefile.am        |    4 +-
 .../cpp/ignite/project/vs/ignite.vcxproj        |    4 +-
 modules/platforms/cpp/jni/Makefile.am           |    4 +-
 .../cpp/jni/include/ignite/jni/exports.h        |    3 +-
 .../platforms/cpp/jni/include/ignite/jni/java.h |    6 +-
 .../cpp/jni/include/ignite/jni/utils.h          |   91 +-
 .../platforms/cpp/jni/project/vs/jni.vcxproj    |    1 -
 modules/platforms/cpp/jni/project/vs/module.def |    6 +-
 modules/platforms/cpp/jni/src/exports.cpp       |   12 +-
 modules/platforms/cpp/jni/src/java.cpp          |   36 +-
 .../platforms/cpp/odbc-test/include/test_type.h |   42 +-
 .../cpp/odbc-test/src/api_robustness_test.cpp   |  108 ++
 .../cpp/odbc-test/src/queries_test.cpp          |  153 +-
 .../cpp/odbc-test/src/sql_outer_join_test.cpp   |    2 +-
 modules/platforms/cpp/odbc/Makefile.am          |    4 +-
 modules/platforms/cpp/odbc/README.txt           |   23 +-
 .../platforms/cpp/odbc/include/ignite/odbc.h    |   12 +-
 .../ignite/odbc/diagnostic/diagnosable.h        |    7 +
 .../odbc/diagnostic/diagnosable_adapter.h       |   10 +
 .../ignite/odbc/diagnostic/diagnostic_record.h  |   19 +
 .../odbc/diagnostic/diagnostic_record_storage.h |   16 +
 .../cpp/odbc/include/ignite/odbc/statement.h    |   42 +
 .../cpp/odbc/install/ignite-odbc-amd64.wxs      |  114 ++
 .../cpp/odbc/install/ignite-odbc-x86.wxs        |  114 ++
 .../odbc/os/win/src/system/socket_client.cpp    |    4 +-
 .../platforms/cpp/odbc/project/vs/odbc.vcxproj  |    4 +-
 .../odbc/src/app/application_data_buffer.cpp    |   34 +-
 modules/platforms/cpp/odbc/src/connection.cpp   |   21 +-
 .../odbc/src/diagnostic/diagnostic_record.cpp   |   16 +-
 .../diagnostic/diagnostic_record_storage.cpp    |   18 +
 modules/platforms/cpp/odbc/src/entry_points.cpp |   26 +-
 modules/platforms/cpp/odbc/src/odbc.cpp         |  175 +--
 modules/platforms/cpp/odbc/src/statement.cpp    |  151 ++
 .../Apache.Ignite.AspNet.Tests/App.config       |    1 +
 .../ExpiryCacheHolderTest.cs                    |   11 +
 .../IgniteSessionStateStoreProviderTest.cs      |   70 +-
 .../Apache.Ignite.AspNet.csproj                 |    3 +-
 .../Apache.Ignite.AspNet.nuspec                 |    3 -
 .../IgniteSessionStateStoreProvider.cs          |   21 +-
 .../Apache.Ignite.AspNet/Impl/ConfigUtil.cs     |    5 +
 .../Properties/AssemblyInfo.cs                  |    2 +-
 .../Properties/AssemblyInfo.cs                  |   36 +-
 .../Apache.Ignite.Core.Tests.NuGet.csproj       |   20 +-
 .../EntityFrameworkCacheTest.cs                 |   62 +
 .../Properties/AssemblyInfo.cs                  |   34 +-
 .../packages.config                             |    2 +
 .../Apache.Ignite.Core.Tests.TestDll.csproj     |    5 -
 .../Properties/AssemblyInfo.cs                  |   34 +-
 .../Apache.Ignite.Core.Tests.csproj             |   26 +-
 .../Binary/BinaryBuilderSelfTest.cs             |   24 +-
 .../Binary/BinaryReaderWriterTest.cs            |  200 +++
 .../Binary/IO/BinaryStreamsTest.cs              |  151 ++
 .../Binary/JavaTypeMappingTest.cs               |  158 ++
 .../Binary/TypeResolverTest.cs                  |  107 ++
 .../Affinity/AffinityFunctionSpringTest.cs      |   38 +-
 .../Cache/Affinity/AffinityFunctionTest.cs      |   33 +-
 .../Cache/Affinity/AffinityKeyTest.cs           |   66 +
 .../Affinity/AffinityTopologyVersionTest.cs     |   59 +
 .../Cache/CacheAbstractTest.cs                  |  141 +-
 .../Cache/CacheConfigurationTest.cs             |   25 +-
 .../Cache/CacheMetricsTest.cs                   |  252 +++
 .../Cache/CacheResultTest.cs                    |   75 +
 .../Cache/CacheSwapSpaceTest.cs                 |  122 ++
 .../Cache/CacheTestAsyncWrapper.cs              |   13 +
 .../Cache/Query/CacheLinqTest.cs                |   21 +-
 .../Query/CacheQueriesCodeConfigurationTest.cs  |   12 +
 .../Cache/Query/CacheQueriesTest.cs             |   95 +-
 .../Continuous/ContinuousQueryAbstractTest.cs   |   42 +-
 .../Cache/Store/CacheParallelLoadStoreTest.cs   |    2 +-
 .../Cache/Store/CacheStoreAdapterTest.cs        |   90 ++
 .../Cache/Store/CacheTestParallelLoadStore.cs   |    9 +
 .../Collections/MultiValueDictionaryTest.cs     |   58 +
 .../Collections/ReadOnlyCollectionTest.cs       |   59 +
 .../Collections/ReadOnlyDictionaryTest.cs       |   70 +
 .../Common/IgniteGuidTest.cs                    |   62 +
 .../Compute/AbstractTaskTest.cs                 |   40 +-
 .../Compute/BinarizableClosureTaskTest.cs       |   18 +-
 .../Compute/BinarizableTaskTest.cs              |   18 +-
 .../Compute/CancellationTest.cs                 |   10 +
 .../Compute/ClosureTaskTest.cs                  |  192 +--
 .../Compute/ComputeApiTest.cs                   |   92 +-
 .../Compute/FailoverTaskSelfTest.cs             |    5 +-
 .../Compute/IgniteExceptionTaskSelfTest.cs      |   43 +-
 .../Compute/ResourceTaskTest.cs                 |   51 +
 .../Compute/SerializableClosureTaskTest.cs      |    5 +
 .../Compute/TaskAdapterTest.cs                  |    5 +-
 .../Compute/TaskResultTest.cs                   |   14 +-
 .../Config/Compute/compute-standalone.xml       |    1 +
 .../Config/cache-query.xml                      |   38 +-
 .../Dataload/DataStreamerTestTopologyChange.cs  |   27 +-
 .../Apache.Ignite.Core.Tests/EventsTest.cs      |  192 ++-
 .../Examples/ExamplesTest.cs                    |   38 +-
 .../Apache.Ignite.Core.Tests/ExceptionsTest.cs  |   49 +
 .../Apache.Ignite.Core.Tests/ExecutableTest.cs  |   64 +-
 .../IgniteConfigurationSectionTest.cs           |   20 +
 .../IgniteConfigurationSerializerTest.cs        |  189 ++-
 .../IgniteConfigurationTest.cs                  |   24 +-
 .../Log/CustomLoggerTest.cs                     |   27 +-
 .../ProjectFilesTest.cs                         |   72 +-
 .../Properties/AssemblyInfo.cs                  |   36 +-
 .../Apache.Ignite.Core.Tests/ReconnectTest.cs   |   81 +-
 .../Apache.Ignite.Core.Tests/TestRunner.cs      |   37 +-
 .../Apache.Ignite.Core.Tests/TestUtils.cs       |   14 +-
 .../TypeResolverTest.cs                         |  107 --
 .../dotnet/Apache.Ignite.Core.Tests/app.config  |    1 +
 .../Apache.Ignite.Core.Tests/custom_app.config  |    1 +
 .../Apache.Ignite.Core.Tests/packages.config    |    2 +-
 .../Apache.Ignite.Core.Schema.nuspec            |    1 -
 .../Apache.Ignite.Core.csproj                   |   12 +-
 .../Apache.Ignite.Core.nuspec                   |    3 -
 .../Binary/BinaryConfiguration.cs               |    5 +-
 .../Cache/Affinity/AffinityFunctionContext.cs   |    4 +-
 .../Cache/Affinity/AffinityKey.cs               |   11 +
 .../Cache/CachePartialUpdateException.cs        |    6 +-
 .../Cache/Configuration/CacheConfiguration.cs   |   22 +
 .../dotnet/Apache.Ignite.Core/Cache/ICache.cs   |   19 +-
 .../Apache.Ignite.Core/Cache/ICacheLock.cs      |    2 +-
 .../Apache.Ignite.Core/Cache/ICacheMetrics.cs   |  244 ++-
 .../Cache/Query/SqlFieldsQuery.cs               |   16 +
 .../Store/CacheParallelLoadStoreAdapter.cs      |    7 +
 .../Compute/ComputeTaskSplitAdapter.cs          |    2 +-
 .../Apache.Ignite.Core/Events/DiscoveryEvent.cs |    4 +-
 .../Apache.Ignite.Core/Events/EventReader.cs    |    6 +-
 .../Apache.Ignite.Core/IgniteConfiguration.cs   |   40 +-
 .../IgniteConfigurationSection.xsd              |   63 +-
 .../dotnet/Apache.Ignite.Core/Ignition.cs       |   12 +
 .../Apache.Ignite.Core/Impl/Binary/Binary.cs    |    2 +-
 .../Impl/Binary/BinaryObject.cs                 |    2 +
 .../Impl/Binary/BinaryObjectBuilder.cs          |    2 +-
 .../Impl/Binary/BinaryObjectHandle.cs           |   59 -
 .../Impl/Binary/BinaryObjectHeader.cs           |    7 +-
 .../Impl/Binary/BinaryObjectSchemaSerializer.cs |    2 +-
 .../Impl/Binary/BinaryProcessor.cs              |  156 ++
 .../Impl/Binary/BinaryReader.cs                 |    3 +-
 .../Binary/BinarySurrogateTypeDescriptor.cs     |    2 +-
 .../Impl/Binary/BinaryUtils.cs                  |   12 +
 .../Impl/Binary/BinaryWriter.cs                 |   26 +-
 .../Impl/Binary/DateTimeHolder.cs               |    4 +-
 .../Impl/Binary/Io/BinaryStreamAdapter.cs       |    5 +
 .../Impl/Binary/Io/BinaryStreamBase.cs          |   11 +-
 .../Impl/Binary/Io/IBinaryStream.cs             |    2 +-
 .../Apache.Ignite.Core/Impl/Binary/JavaTypes.cs |   50 +-
 .../Impl/Binary/Marshaller.cs                   |   47 +-
 .../Impl/Binary/SerializableObjectHolder.cs     |    6 +-
 .../Affinity/AffinityFunctionSerializer.cs      |    2 +-
 .../Impl/Cache/CacheAffinityImpl.cs             |    2 +-
 .../Impl/Cache/CacheEntryFilterHolder.cs        |   10 +-
 .../Impl/Cache/CacheEntryProcessorHolder.cs     |    8 +-
 .../Apache.Ignite.Core/Impl/Cache/CacheImpl.cs  |   81 +-
 .../Impl/Cache/CacheMetricsImpl.cs              |  617 ++++++--
 .../Apache.Ignite.Core/Impl/Cache/CacheOp.cs    |    5 +-
 .../Cache/Event/JavaCacheEntryEventFilter.cs    |    2 +
 .../Impl/Cache/Expiry/ExpiryPolicyFactory.cs    |   46 +
 .../Impl/Cache/Expiry/ExpiryPolicySerializer.cs |  134 ++
 .../Impl/Cache/Query/AbstractQueryCursor.cs     |    4 +-
 .../Continuous/ContinuousQueryFilterHolder.cs   |    8 +-
 .../Continuous/ContinuousQueryHandleImpl.cs     |    2 +-
 .../Impl/Cluster/ClusterGroupImpl.cs            |   92 +-
 .../Impl/Cluster/IClusterGroupEx.cs             |   35 -
 .../Impl/Collections/MultiValueDictionary.cs    |   26 -
 .../Impl/Collections/ReadOnlyDictionary.cs      |    2 +-
 .../Apache.Ignite.Core/Impl/Common/Classpath.cs |   12 +-
 .../Apache.Ignite.Core/Impl/Common/Fnv1Hash.cs  |    2 +-
 .../Impl/Common/IgniteHome.cs                   |   30 +-
 .../Impl/Common/ResizeableArray.cs              |   64 -
 .../Impl/Compute/Closure/ComputeActionJob.cs    |    6 +-
 .../Impl/Compute/Closure/ComputeFuncJob.cs      |    8 +-
 .../Impl/Compute/Closure/ComputeOutFuncJob.cs   |    9 +-
 .../Impl/Compute/ComputeFunc.cs                 |    7 +-
 .../Impl/Compute/ComputeImpl.cs                 |    4 +-
 .../Impl/Compute/ComputeJob.cs                  |    6 +-
 .../Impl/Compute/ComputeJobHolder.cs            |    8 +-
 .../Impl/Compute/ComputeOutFunc.cs              |    6 +-
 .../Impl/DataStructures/AtomicLong.cs           |   14 +-
 .../Impl/DataStructures/AtomicReference.cs      |    4 +-
 .../Impl/DataStructures/AtomicSequence.cs       |   14 +-
 .../Impl/Datastream/DataStreamerImpl.cs         |   20 +-
 .../Impl/Datastream/StreamReceiverHolder.cs     |    2 +-
 .../Impl/Events/EventTypeConverter.cs           |    3 +
 .../Apache.Ignite.Core/Impl/Events/Events.cs    |    7 +-
 .../Apache.Ignite.Core/Impl/ExceptionUtils.cs   |    2 +
 .../Apache.Ignite.Core/Impl/Handle/Handle.cs    |   12 +-
 .../Impl/Handle/HandleRegistry.cs               |   11 +-
 .../Apache.Ignite.Core/Impl/Handle/IHandle.cs   |    5 -
 .../dotnet/Apache.Ignite.Core/Impl/Ignite.cs    |   29 +-
 .../Apache.Ignite.Core/Impl/IgniteProxy.cs      |   10 +-
 .../Apache.Ignite.Core/Impl/IgniteUtils.cs      |   27 +-
 .../Impl/InteropExceptionHolder.cs              |   88 --
 .../Memory/PlatformBigEndianMemoryStream.cs     |   34 +-
 .../Impl/Memory/PlatformMemoryUtils.cs          |   30 -
 .../Impl/Memory/PlatformRawMemory.cs            |    5 +
 .../Impl/Messaging/MessageListenerHolder.cs     |   14 +-
 .../Apache.Ignite.Core/Impl/PlatformTarget.cs   |  115 +-
 .../Impl/Services/Services.cs                   |    4 +-
 .../Impl/SwapSpace/SwapSpaceSerializer.cs       |   99 ++
 .../Impl/Transactions/TransactionsImpl.cs       |   12 +-
 .../Impl/Unmanaged/IgniteJniNativeMethods.cs    |   12 +-
 .../Impl/Unmanaged/UnmanagedCallbacks.cs        |   58 +-
 .../Impl/Unmanaged/UnmanagedTarget.cs           |    2 +-
 .../Impl/Unmanaged/UnmanagedUtils.cs            |   19 +-
 .../dotnet/Apache.Ignite.Core/NuGet/Install.ps1 |   14 +
 .../NuGet/LINQPad/BinaryModeExample.linq        |   94 ++
 .../Apache.Ignite.Core/NuGet/Uninstall.ps1      |   14 +
 .../Properties/AssemblyInfo.cs                  |   36 +-
 .../SwapSpace/File/FileSwapSpaceSpi.cs          |  105 ++
 .../SwapSpace/ISwapSpaceSpi.cs                  |   35 +
 .../Transactions/ITransactions.cs               |    2 +-
 .../TransactionDeadlockException.cs             |   71 +
 .../Apache.Ignite.EntityFramework.Tests.csproj  |   96 ++
 .../Apache.Ignite.EntityFramework.Tests.snk     |  Bin 0 -> 596 bytes
 .../App.config                                  |   71 +
 .../ArrayDbDataReaderTests.cs                   |  192 +++
 .../DbCachingPolicyTest.cs                      |   43 +
 .../EntityFrameworkCacheInitializationTest.cs   |  137 ++
 .../EntityFrameworkCacheTest.cs                 |  951 +++++++++++
 .../Properties/AssemblyInfo.cs                  |   39 +
 .../packages.config                             |   23 +
 .../Apache.Ignite.EntityFramework.csproj        |   95 ++
 .../Apache.Ignite.EntityFramework.nuspec        |   57 +
 .../Apache.Ignite.EntityFramework.snk           |  Bin 0 -> 596 bytes
 .../DbCachingMode.cs                            |   48 +
 .../DbCachingPolicy.cs                          |   72 +
 .../DbQueryInfo.cs                              |   78 +
 .../IDbCachingPolicy.cs                         |   58 +
 .../IgniteDbConfiguration.cs                    |  340 ++++
 .../Impl/ArrayDbDataReader.cs                   |  305 ++++
 .../Impl/DataReaderField.cs                     |   74 +
 .../Impl/DataReaderResult.cs                    |   93 ++
 .../Impl/DbCache.cs                             |  295 ++++
 .../Impl/DbCacheKey.cs                          |   92 ++
 .../Impl/DbCommandDefinitionProxy.cs            |   51 +
 .../Impl/DbCommandInfo.cs                       |  158 ++
 .../Impl/DbCommandProxy.cs                      |  263 ++++
 .../Impl/DbProviderServicesProxy.cs             |  169 ++
 .../Impl/DbTransactionInterceptor.cs            |  134 ++
 .../Properties/AssemblyInfo.cs                  |   41 +
 .../packages.config                             |   20 +
 modules/platforms/dotnet/Apache.Ignite.FxCop    |    2 +
 .../Apache.Ignite.Linq.csproj                   |    7 +-
 .../Apache.Ignite.Linq.nuspec                   |    3 -
 .../Apache.Ignite.Linq/ICacheQueryable.cs       |   32 +-
 .../Impl/CacheFieldsQueryExecutor.cs            |   34 +-
 .../Impl/CacheQueryableBase.cs                  |   10 +-
 .../Properties/AssemblyInfo.cs                  |   36 +-
 .../Apache.Ignite.Log4Net.csproj                |    4 +-
 .../Apache.Ignite.NLog.csproj                   |    9 +-
 .../Properties/AssemblyInfo.cs                  |    4 +-
 .../dotnet/Apache.Ignite.NLog/packages.config   |    2 +
 modules/platforms/dotnet/Apache.Ignite.sln      |   33 +
 .../dotnet/Apache.Ignite.sln.DotSettings        |    4 +
 .../dotnet/Apache.Ignite/Apache.Ignite.csproj   |    5 -
 .../Apache.Ignite/Config/ArgsConfigurator.cs    |    7 +-
 .../dotnet/Apache.Ignite/Config/Configurator.cs |   10 +
 .../dotnet/Apache.Ignite/IgniteRunner.cs        |   20 +-
 .../Apache.Ignite/Properties/AssemblyInfo.cs    |   36 +-
 modules/platforms/dotnet/README.md              |  150 ++
 modules/platforms/dotnet/README.txt             |   13 +-
 .../Apache.Ignite.Examples.csproj               |   10 +
 .../examples/Apache.Ignite.Examples/App.config  |    1 +
 .../Compute/ClosureExample.cs                   |   12 +-
 .../Compute/TaskExample.cs                      |   14 +-
 .../DataStructures/AtomicLongExample.cs         |   65 +
 .../DataStructures/AtomicReferenceExample.cs    |   65 +
 .../DataStructures/AtomicSequenceExample.cs     |   88 ++
 .../Datagrid/BinaryModeExample.cs               |  272 ++++
 .../Datagrid/ContinuousQueryExample.cs          |   16 +-
 .../Datagrid/DataStreamerExample.cs             |   12 +-
 .../Datagrid/EntryProcessorExample.cs           |   90 ++
 .../Datagrid/LinqExample.cs                     |  234 ++-
 .../Datagrid/MultiTieredCacheExample.cs         |  136 ++
 .../Datagrid/NearCacheExample.cs                |   87 +
 .../Datagrid/OptimisticTransactionExample.cs    |  110 ++
 .../Datagrid/PutGetExample.cs                   |   12 +-
 .../Datagrid/QueryExample.cs                    |  227 ++-
 .../Datagrid/StoreExample.cs                    |   20 +-
 .../TransactionDeadlockDetectionExample.cs      |  121 ++
 .../Datagrid/TransactionExample.cs              |   14 +-
 .../Events/EventsExample.cs                     |   16 +-
 .../Messaging/MessagingExample.cs               |   10 +-
 .../Misc/ClientReconnectExample.cs              |  159 ++
 .../Misc/LifecycleExample.cs                    |   13 +-
 .../Properties/AssemblyInfo.cs                  |   40 +-
 .../Services/IMapService.cs                     |    4 +-
 .../Services/ServicesExample.cs                 |   10 +-
 .../Apache.Ignite.ExamplesDll.csproj            |    7 +-
 .../Apache.Ignite.ExamplesDll/Binary/Account.cs |    6 +-
 .../Apache.Ignite.ExamplesDll/Binary/Address.cs |    2 +-
 .../Binary/Employee.cs                          |   21 +-
 .../Binary/EmployeeKey.cs                       |   88 --
 .../Binary/Organization.cs                      |    2 +-
 .../Compute/AverageSalaryJob.cs                 |   14 +-
 .../Compute/AverageSalaryTask.cs                |    9 +-
 .../Compute/CharacterCountClosure.cs            |    6 +-
 .../Compute/CharacterCountReducer.cs            |    4 +-
 .../DataStructures/AtomicLongIncrementAction.cs |   49 +
 .../AtomicReferenceModifyAction.cs              |   61 +
 .../AtomicSequenceIncrementAction.cs            |   49 +
 .../Datagrid/CacheIncrementEntryProcessor.cs    |   45 +
 .../Datagrid/CachePutEntryProcessor.cs          |   45 +
 .../Datagrid/ContinuousQueryFilter.cs           |    6 +-
 .../Datagrid/EmployeeStore.cs                   |   13 +-
 .../Datagrid/EmployeeStorePredicate.cs          |    5 +-
 .../Datagrid/ScanQueryFilter.cs                 |   50 +
 .../Events/LocalListener.cs                     |    8 +-
 .../Messaging/LocalListener.cs                  |    8 +-
 .../Messaging/RemoteOrderedListener.cs          |   10 +-
 .../Messaging/RemoteUnorderedListener.cs        |   10 +-
 .../Properties/AssemblyInfo.cs                  |   38 +-
 .../Services/MapService.cs                      |   12 +-
 .../org/apache/ignite/IgniteSpringBean.java     |   23 +-
 .../src/test/config/incorrect-store-cache.xml   |    2 +
 .../src/test/config/jdbc-pojo-store-builtin.xml |    3 +
 .../src/test/config/jdbc-pojo-store-obj.xml     |    3 +
 modules/spring/src/test/config/node.xml         |    2 +
 modules/spring/src/test/config/node1.xml        |    2 +
 .../test/config/pojo-incorrect-store-cache.xml  |    2 +
 modules/spring/src/test/config/store-cache.xml  |    2 +
 modules/spring/src/test/config/store-cache1.xml |    2 +
 .../IgniteStartFromStreamConfigurationTest.java |   18 +-
 modules/storm/README.txt                        |    2 +-
 modules/storm/pom.xml                           |    2 +-
 .../ignite/stream/storm/StormStreamer.java      |   10 +-
 .../storm/StormIgniteStreamerSelfTest.java      |   20 +-
 .../ignite/stream/storm/TestStormSpout.java     |   10 +-
 .../scanners/http/UriDeploymentHttpScanner.java |    8 +-
 .../commands/cache/VisorCacheCommand.scala      |    7 +-
 modules/web-console/backend/app/agent.js        |   32 +-
 modules/web-console/backend/app/browser.js      |   13 +
 modules/web-console/backend/app/mongo.js        |    6 +
 .../backend/config/settings.json.sample         |    7 -
 modules/web-console/backend/index.js            |    6 +-
 modules/web-console/backend/middlewares/host.js |    7 +-
 modules/web-console/backend/routes/agent.js     |    4 +-
 modules/web-console/backend/services/agents.js  |    2 +-
 modules/web-console/backend/services/caches.js  |    2 +
 .../docker/compose/backend/.dockerignore        |    2 +
 .../docker/compose/backend/Dockerfile           |    6 +-
 .../web-console/docker/compose/backend/build.sh |    4 +-
 .../docker/compose/docker-compose.yml           |    5 -
 .../docker/compose/frontend/DockerfileBuild     |    4 +-
 .../docker/compose/frontend/build.sh            |    6 +-
 .../compose/frontend/nginx/web-console.conf     |    9 +
 .../web-console/docker/standalone/.dockerignore |    5 +
 .../web-console/docker/standalone/Dockerfile    |   10 +-
 modules/web-console/docker/standalone/build.sh  |    4 +-
 .../docker/standalone/docker-compose.yml        |    7 +-
 .../docker/standalone/nginx/web-console.conf    |    9 +
 .../frontend/app/data/pom-dependencies.json     |    2 +-
 .../directives/ui-ace-pojos/ui-ace-pojos.jade   |    2 +-
 .../frontend/app/filters/duration.filter.js     |    3 +
 .../helpers/jade/form/form-field-checkbox.jade  |    2 +-
 .../helpers/jade/form/form-field-datalist.jade  |    2 +-
 .../helpers/jade/form/form-field-dropdown.jade  |    2 +-
 .../helpers/jade/form/form-field-number.jade    |    2 +-
 .../helpers/jade/form/form-field-password.jade  |    2 +-
 .../app/helpers/jade/form/form-field-text.jade  |    2 +-
 .../frontend/app/helpers/jade/mixins.jade       |   24 +-
 .../modules/configuration/generator/Beans.js    |    6 +
 .../generator/ConfigurationGenerator.js         |  165 +-
 .../generator/JavaTransformer.service.js        |   15 +-
 .../generator/Properties.service.js             |   19 +
 .../generator/SpringTransformer.service.js      |   22 +-
 .../generator/defaults/cache.provider.js        |    8 +
 .../generator/defaults/cluster.provider.js      |    2 +-
 .../app/modules/form/field/tooltip.directive.js |    2 +-
 .../app/modules/form/group/tooltip.directive.js |    2 +-
 .../app/modules/form/panel/field.directive.js   |    4 +-
 .../app/modules/sql/scan-filter-input.jade      |    2 +-
 .../frontend/app/modules/sql/sql.controller.js  |    6 +-
 .../configuration/caches/client-near-cache.jade |    2 +-
 .../configuration/caches/concurrency.jade       |    2 +-
 .../states/configuration/caches/general.jade    |    2 +-
 .../states/configuration/caches/memory.jade     |    2 +-
 .../configuration/caches/near-cache-client.jade |    2 +-
 .../configuration/caches/near-cache-server.jade |    2 +-
 .../configuration/caches/node-filter.jade       |    2 +-
 .../states/configuration/caches/query.jade      |    2 +-
 .../states/configuration/caches/rebalance.jade  |    2 +-
 .../states/configuration/caches/statistics.jade |    2 +-
 .../states/configuration/caches/store.jade      |   20 +-
 .../states/configuration/clusters/atomic.jade   |    2 +-
 .../configuration/clusters/attributes.jade      |    2 +-
 .../states/configuration/clusters/binary.jade   |    2 +-
 .../configuration/clusters/cache-key-cfg.jade   |    2 +-
 .../configuration/clusters/checkpoint.jade      |    8 +-
 .../configuration/clusters/checkpoint/fs.jade   |    2 +-
 .../configuration/clusters/checkpoint/jdbc.jade |   41 +-
 .../configuration/clusters/checkpoint/s3.jade   |  229 +--
 .../configuration/clusters/collision.jade       |   12 +-
 .../clusters/collision/custom.jade              |    2 +-
 .../clusters/collision/fifo-queue.jade          |    2 +-
 .../clusters/collision/job-stealing.jade        |    2 +-
 .../clusters/collision/priority-queue.jade      |    2 +-
 .../configuration/clusters/communication.jade   |    2 +-
 .../configuration/clusters/connector.jade       |    2 +-
 .../configuration/clusters/deployment.jade      |    2 +-
 .../configuration/clusters/discovery.jade       |    2 +-
 .../states/configuration/clusters/events.jade   |    2 +-
 .../states/configuration/clusters/failover.jade |    2 +-
 .../states/configuration/clusters/general.jade  |    2 +-
 .../clusters/general/discovery/cloud.jade       |    2 +-
 .../clusters/general/discovery/google.jade      |    2 +-
 .../clusters/general/discovery/jdbc.jade        |    3 +-
 .../clusters/general/discovery/multicast.jade   |    2 +-
 .../clusters/general/discovery/s3.jade          |    2 +-
 .../clusters/general/discovery/shared.jade      |    2 +-
 .../clusters/general/discovery/vm.jade          |    2 +-
 .../clusters/general/discovery/zookeeper.jade   |    2 +-
 .../bounded-exponential-backoff.jade            |    2 +-
 .../discovery/zookeeper/retrypolicy/custom.jade |    2 +-
 .../retrypolicy/exponential-backoff.jade        |    2 +-
 .../zookeeper/retrypolicy/forever.jade          |    2 +-
 .../zookeeper/retrypolicy/n-times.jade          |    2 +-
 .../zookeeper/retrypolicy/one-time.jade         |    2 +-
 .../zookeeper/retrypolicy/until-elapsed.jade    |    2 +-
 .../states/configuration/clusters/igfs.jade     |    2 +-
 .../configuration/clusters/load-balancing.jade  |    2 +-
 .../states/configuration/clusters/logger.jade   |    2 +-
 .../configuration/clusters/logger/custom.jade   |    2 +-
 .../configuration/clusters/logger/log4j.jade    |    2 +-
 .../configuration/clusters/logger/log4j2.jade   |    2 +-
 .../configuration/clusters/marshaller.jade      |    2 +-
 .../states/configuration/clusters/metrics.jade  |    2 +-
 .../states/configuration/clusters/odbc.jade     |    2 +-
 .../states/configuration/clusters/ssl.jade      |    2 +-
 .../states/configuration/clusters/swap.jade     |    2 +-
 .../states/configuration/clusters/thread.jade   |    2 +-
 .../states/configuration/clusters/time.jade     |    2 +-
 .../configuration/clusters/transactions.jade    |    2 +-
 .../states/configuration/domains/general.jade   |    2 +-
 .../states/configuration/domains/query.jade     |   16 +-
 .../states/configuration/domains/store.jade     |   12 +-
 .../modules/states/configuration/igfs/dual.jade |    2 +-
 .../states/configuration/igfs/fragmentizer.jade |    2 +-
 .../states/configuration/igfs/general.jade      |    2 +-
 .../modules/states/configuration/igfs/ipc.jade  |    2 +-
 .../modules/states/configuration/igfs/misc.jade |    6 +-
 .../states/configuration/igfs/secondary.jade    |    2 +-
 .../configuration/summary/summary.controller.js |   12 +-
 .../frontend/controllers/clusters-controller.js |   10 +
 .../frontend/controllers/domains-controller.js  |    8 +-
 .../frontend/gulpfile.babel.js/tasks/jade.js    |    4 +-
 .../frontend/gulpfile.babel.js/tasks/test.js    |   92 --
 .../gulpfile.babel.js/webpack/common.js         |    5 +-
 .../webpack/environments/development.js         |    5 +
 modules/web-console/frontend/package.json       |    2 +-
 .../stylesheets/_font-awesome-custom.scss       |   18 +
 .../frontend/public/stylesheets/style.scss      |   13 +-
 .../frontend/views/configuration/caches.jade    |   22 +-
 .../frontend/views/configuration/clusters.jade  |   50 +-
 .../views/configuration/domains-import.jade     |    4 +-
 .../frontend/views/configuration/domains.jade   |    8 +-
 .../frontend/views/configuration/igfs.jade      |   14 +-
 .../frontend/views/configuration/summary.jade   |    2 +-
 .../frontend/views/includes/header.jade         |   15 +-
 .../frontend/views/settings/profile.jade        |    2 +-
 modules/web-console/frontend/views/sql/sql.jade |    2 +-
 .../views/templates/agent-download.jade         |    2 +-
 .../frontend/views/templates/batch-confirm.jade |    2 +-
 .../frontend/views/templates/clone.jade         |    2 +-
 .../frontend/views/templates/confirm.jade       |    2 +-
 modules/web-console/web-agent/README.txt        |    4 +-
 .../web-agent/bin/ignite-web-agent.bat          |    7 +-
 .../web-agent/bin/ignite-web-agent.sh           |    6 +-
 .../console/agent/AgentConfiguration.java       |    5 +-
 .../ignite/console/agent/AgentLauncher.java     |    6 +-
 .../ignite/console/demo/AgentClusterDemo.java   |    1 +
 .../org/apache/ignite/yardstick/IgniteNode.java |   74 +-
 .../cache/IgniteAtomicSequenceBenchmark.java    |   47 +
 parent/pom.xml                                  |    6 +-
 pom.xml                                         |    8 +
 1145 files changed, 60724 insertions(+), 25205 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/822d7235/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
index 1c7dbdb,de6cbed..ef483ef
--- a/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
@@@ -473,10 -483,23 +483,26 @@@ public final class IgniteSystemProperti
      @Deprecated
      public static final String IGNITE_BINARY_DONT_WRAP_TREE_STRUCTURES = "IGNITE_BINARY_DONT_WRAP_TREE_STRUCTURES";
  
 +    /** */
 +    public static final String IGNITE_IO_BALANCE_PERIOD = "IGNITE_IO_BALANCE_PERIOD";
 +
      /**
+      * When set to {@code true} fields are written by BinaryMarshaller in sorted order. Otherwise
+      * the natural order is used.
+      * <p>
+      * @deprecated Should be removed in Apache Ignite 2.0.
+      */
+     @Deprecated
+     public static final String IGNITE_BINARY_SORT_OBJECT_FIELDS = "IGNITE_BINARY_SORT_OBJECT_FIELDS";
+ 
+     /**
+      * Whether Ignite can access unaligned memory addresses.
+      * <p>
+      * Defaults to {@code} false, meaning that unaligned access will be performed only on x86 architecture.
+      */
+     public static final String IGNITE_UNALIGNED_MEMORY_ACCESS = "IGNITE_UNALIGNED_MEMORY_ACCESS";
+ 
+     /**
       * Enforces singleton.
       */
      private IgniteSystemProperties() {

http://git-wip-us.apache.org/repos/asf/ignite/blob/822d7235/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/822d7235/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
index 54ca6d0,b3a9eec..16acbc8
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
@@@ -1654,6 -1652,10 +1656,8 @@@ public class IgnitionEx 
  
              execSvc.allowCoreThreadTimeOut(true);
  
 -            // Note that since we use 'LinkedBlockingQueue', number of
 -            // maximum threads has no effect.
+             validateThreadPoolSize(cfg.getSystemThreadPoolSize(), "system");
+ 
              sysExecSvc = new IgniteThreadPoolExecutor(
                  "sys",
                  cfg.getGridName(),

http://git-wip-us.apache.org/repos/asf/ignite/blob/822d7235/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
index 1b92465,f36191c..389d9a1
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
@@@ -762,11 -766,21 +766,31 @@@ public class GridIoMessageFactory imple
                  break;
  
              case 126:
+                 msg = new GridNearAtomicSingleUpdateInvokeRequest();
+ 
+                 break;
+ 
+             case 127:
+                 msg = new GridNearAtomicSingleUpdateFilterRequest();
+ 
+                 break;
+ 
+             case -36:
+                 msg = new GridDhtAtomicSingleUpdateRequest();
+ 
+                 break;
+ 
++            case -37:
++                msg = new TcpCommunicationSpi.HandshakeMessage2();
++
++                break;
++
++            case -38:
 +                msg = new IgniteIoTestMessage();
 +
 +                break;
 +
-             // [-3..119] [124-126] - this
+             // [-3..119] [124..127] [-36]- this
              // [120..123] - DR
              // [-4..-22, -30..-35] - SQL
              default:

http://git-wip-us.apache.org/repos/asf/ignite/blob/822d7235/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/822d7235/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/822d7235/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/822d7235/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java
index 72d362b,f2fbb0e..1854e52
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java
@@@ -602,15 -487,7 +487,12 @@@ public class GridDhtAtomicUpdateReques
      }
  
      /** {@inheritDoc} */
 +    @Override public int partition() {
 +        return partIds != null && !partIds.isEmpty() ? partIds.get(0) : -1;
 +    }
 +
-     /**
-      * @param idx Index.
-      * @return Conflict expire time.
-      */
-     public long conflictExpireTime(int idx) {
++    /** {@inheritDoc} */
+     @Override public long conflictExpireTime(int idx) {
          if (conflictExpireTimes != null) {
              assert idx >= 0 && idx < conflictExpireTimes.size();