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

[vozerov]

Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5


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

Branch: refs/heads/ignite-1.5
Commit: bbdb20248f606f4b5e9da709d54027a7158b6ea3
Parents: 627134b 3aa6f82
Author: vozerov-gridgain 
Authored: Tue Dec 22 11:29:06 2015 +0300
Committer: vozerov-gridgain 
Committed: Tue Dec 22 11:29:06 2015 +0300

--
 .../internal/processors/cache/IgniteCacheProxy.java|  3 +--
 .../visor/cache/VisorCacheStoreConfiguration.java  | 13 -
 .../visor/commands/cache/VisorCacheCommand.scala   |  1 +
 .../yardstick/config/benchmark-multicast.properties|  2 +-
 4 files changed, 15 insertions(+), 4 deletions(-)
--

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

[sboikov]

Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5


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

Branch: refs/heads/ignite-1.5
Commit: 276207a5c7a7ee0a4c76f7aebb569cf2215da10b
Parents: 60d157b d134730
Author: sboikov 
Authored: Tue Dec 22 13:30:03 2015 +0300
Committer: sboikov 
Committed: Tue Dec 22 13:30:03 2015 +0300

--
 examples/pom.xml|   2 +-
 examples/schema-import/pom.xml  |   2 +-
 modules/aop/pom.xml |   2 +-
 modules/apache-license-gen/pom.xml  |   2 +-
 modules/aws/pom.xml |   2 +-
 modules/camel/pom.xml   |   2 +-
 modules/clients/pom.xml |   2 +-
 modules/cloud/pom.xml   |   2 +-
 modules/codegen/pom.xml |   2 +-
 modules/core/pom.xml|   2 +-
 .../core/src/main/resources/ignite.properties   |   2 +-
 modules/extdata/p2p/pom.xml |   2 +-
 .../extdata/uri/modules/uri-dependency/pom.xml  |   2 +-
 modules/extdata/uri/pom.xml |   2 +-
 modules/flume/pom.xml   |   2 +-
 modules/gce/pom.xml |   2 +-
 modules/geospatial/pom.xml  |   2 +-
 modules/hadoop/pom.xml  |   2 +-
 modules/hibernate/pom.xml   |   2 +-
 modules/indexing/pom.xml|   2 +-
 ...teCacheFullTextQueryNodeJoiningSelfTest.java | 145 +++
 modules/jcl/pom.xml |   2 +-
 modules/jms11/pom.xml   |   2 +-
 modules/jta/pom.xml |   2 +-
 modules/kafka/pom.xml   |   2 +-
 modules/log4j/pom.xml   |   2 +-
 modules/log4j2/pom.xml  |   2 +-
 modules/mesos/pom.xml   |   2 +-
 modules/mqtt/pom.xml|   2 +-
 modules/osgi-karaf/pom.xml  |   2 +-
 modules/osgi-paxlogging/pom.xml |   2 +-
 modules/osgi/pom.xml|   2 +-
 modules/platforms/cpp/common/configure.ac   |   2 +-
 modules/platforms/cpp/core-test/configure.ac|   2 +-
 modules/platforms/cpp/core/configure.ac |   2 +-
 modules/platforms/cpp/examples/configure.ac |   2 +-
 modules/platforms/cpp/ignite/configure.ac   |   2 +-
 .../Properties/AssemblyInfo.cs  |   6 +-
 .../Properties/AssemblyInfo.cs  |   6 +-
 .../Properties/AssemblyInfo.cs  |   6 +-
 .../Properties/AssemblyInfo.cs  |   6 +-
 .../Apache.Ignite/Properties/AssemblyInfo.cs|   6 +-
 .../Properties/AssemblyInfo.cs  |   6 +-
 .../Properties/AssemblyInfo.cs  |   6 +-
 modules/rest-http/pom.xml   |   2 +-
 modules/scalar-2.10/pom.xml |   2 +-
 modules/scalar/pom.xml  |   2 +-
 modules/schedule/pom.xml|   2 +-
 modules/schema-import/pom.xml   |   2 +-
 modules/slf4j/pom.xml   |   2 +-
 modules/spark-2.10/pom.xml  |   2 +-
 modules/spark/pom.xml   |   2 +-
 modules/spring/pom.xml  |   2 +-
 modules/ssh/pom.xml |   2 +-
 modules/tools/pom.xml   |   2 +-
 modules/twitter/pom.xml |   2 +-
 modules/urideploy/pom.xml   |   2 +-
 modules/visor-console-2.10/pom.xml  |   2 +-
 modules/visor-console/pom.xml   |   2 +-
 modules/visor-plugins/pom.xml   |   2 +-
 modules/web/pom.xml |   2 +-
 modules/yardstick/pom.xml   |   2 +-
 modules/yarn/pom.xml|   2 +-
 modules/zookeeper/pom.xml   |   2 +-
 pom.xml |   4 +-
 65 files changed, 224 insertions(+), 79 deletions(-)
--

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

[vozerov]

Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5


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

Branch: refs/heads/ignite-1.5
Commit: 284868099628452d7336107fe5459d2251864507
Parents: 12d1528 e586923
Author: vozerov-gridgain 
Authored: Mon Dec 21 16:56:22 2015 +0300
Committer: vozerov-gridgain 
Committed: Mon Dec 21 16:56:22 2015 +0300

--
 modules/platforms/cpp/common/configure.ac| 2 +-
 modules/platforms/cpp/core-test/configure.ac | 2 +-
 modules/platforms/cpp/core/configure.ac  | 2 +-
 modules/platforms/cpp/examples/configure.ac  | 2 +-
 modules/platforms/cpp/ignite/configure.ac| 2 +-
 .../dotnet/Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs   | 4 ++--
 .../Apache.Ignite.Core.Tests.TestDll/Properties/AssemblyInfo.cs  | 4 ++--
 .../dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs   | 4 ++--
 .../dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs | 4 ++--
 .../platforms/dotnet/Apache.Ignite/Properties/AssemblyInfo.cs| 4 ++--
 .../examples/Apache.Ignite.Examples/Properties/AssemblyInfo.cs   | 4 ++--
 .../Apache.Ignite.ExamplesDll/Properties/AssemblyInfo.cs | 4 ++--
 12 files changed, 19 insertions(+), 19 deletions(-)
--

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

[sboikov]

Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5


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

Branch: refs/heads/ignite-1.5
Commit: 6a91996e328ad29dde03b68622517360cb7a7ffb
Parents: 8c2b674 c5ed0d0
Author: sboikov 
Authored: Tue Dec 22 10:17:06 2015 +0300
Committer: sboikov 
Committed: Tue Dec 22 10:17:06 2015 +0300

--
 .../visor/cache/VisorCacheStoreConfiguration.java  | 13 -
 .../visor/commands/cache/VisorCacheCommand.scala   |  1 +
 2 files changed, 13 insertions(+), 1 deletion(-)
--

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

[vozerov]

Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5


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

Branch: refs/heads/ignite-1.5
Commit: 24eccb87f7657703390caefe00b06b5a6db08506
Parents: 7ff4759 1a2ebdd
Author: vozerov-gridgain 
Authored: Fri Dec 18 12:44:15 2015 +0300
Committer: vozerov-gridgain 
Committed: Fri Dec 18 12:44:15 2015 +0300

--
 .../ClientAbstractConnectivitySelfTest.java |   2 +-
 .../internal/cluster/ClusterGroupAdapter.java   |  10 +-
 .../dht/preloader/GridDhtPreloader.java |   2 +-
 .../processors/task/GridTaskWorker.java |   8 +-
 .../internal/util/lang/GridNodePredicate.java   |  13 +-
 .../ignite/internal/util/nio/GridNioServer.java |  11 +-
 .../util/nio/GridSelectorNioSessionImpl.java|   7 +
 .../TcpDiscoveryMulticastIpFinder.java  |  12 +-
 .../ignite/internal/ClusterGroupSelfTest.java   |  32 ++-
 .../IgniteClientReconnectCacheTest.java |   7 +-
 .../ignite/internal/TaskNodeRestartTest.java| 230 +++
 ...IgniteCacheBinaryEntryProcessorSelfTest.java |   4 +-
 .../IgniteCacheSizeFailoverTest.java|   4 +-
 .../random/RandomEvictionPolicySelfTest.java|   4 +-
 .../GridServiceProcessorStopSelfTest.java   |  18 +-
 .../IgniteMessagingWithClientTest.java  |   2 -
 .../GridSessionCheckpointAbstractSelfTest.java  |   3 +-
 .../spi/discovery/tcp/TcpDiscoverySelfTest.java |   2 +-
 .../testsuites/IgniteComputeGridTestSuite.java  |   2 +
 19 files changed, 342 insertions(+), 31 deletions(-)
--

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

[vozerov]

Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5


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

Branch: refs/heads/ignite-1.5
Commit: 914b727b3ed2a8dbdbd98c442016c188f37ea057
Parents: dfa84c8 9087f01
Author: vozerov-gridgain 
Authored: Thu Dec 17 12:52:00 2015 +0300
Committer: vozerov-gridgain 
Committed: Thu Dec 17 12:52:00 2015 +0300

--
 examples/pom.xml|  2 +-
 examples/schema-import/pom.xml  |  2 +-
 modules/aop/pom.xml |  2 +-
 modules/apache-license-gen/pom.xml  |  2 +-
 modules/aws/pom.xml |  2 +-
 modules/camel/pom.xml   |  2 +-
 modules/clients/pom.xml |  2 +-
 modules/cloud/pom.xml   |  2 +-
 modules/codegen/pom.xml |  2 +-
 modules/core/pom.xml|  2 +-
 .../apache/ignite/internal/IgniteKernal.java| 35 +++--
 .../processors/cache/GridCacheUtils.java| 18 +--
 .../core/src/main/resources/ignite.properties   |  2 +-
 modules/extdata/p2p/pom.xml |  2 +-
 .../extdata/uri/modules/uri-dependency/pom.xml  |  2 +-
 modules/extdata/uri/pom.xml |  2 +-
 modules/flume/pom.xml   |  2 +-
 modules/gce/pom.xml |  2 +-
 modules/geospatial/pom.xml  |  2 +-
 modules/hadoop/pom.xml  |  2 +-
 modules/hibernate/pom.xml   |  2 +-
 modules/indexing/pom.xml|  2 +-
 .../IgniteBinaryObjectFieldsQuerySelfTest.java  | 53 ++--
 modules/jcl/pom.xml |  2 +-
 modules/jms11/pom.xml   |  2 +-
 modules/jta/pom.xml |  2 +-
 modules/kafka/pom.xml   |  2 +-
 modules/log4j/pom.xml   |  2 +-
 modules/log4j2/pom.xml  |  2 +-
 modules/mesos/pom.xml   |  2 +-
 modules/mqtt/pom.xml|  2 +-
 modules/osgi-karaf/pom.xml  |  2 +-
 modules/osgi-paxlogging/pom.xml |  2 +-
 modules/osgi/pom.xml|  2 +-
 modules/platforms/cpp/common/configure.ac   |  2 +-
 modules/platforms/cpp/core-test/configure.ac|  2 +-
 modules/platforms/cpp/core/configure.ac |  2 +-
 modules/platforms/cpp/examples/configure.ac |  2 +-
 modules/platforms/cpp/ignite/configure.ac   |  2 +-
 .../Properties/AssemblyInfo.cs  |  4 +-
 .../Properties/AssemblyInfo.cs  |  4 +-
 .../Properties/AssemblyInfo.cs  |  4 +-
 .../Properties/AssemblyInfo.cs  |  4 +-
 .../Apache.Ignite/Properties/AssemblyInfo.cs|  4 +-
 .../Properties/AssemblyInfo.cs  |  4 +-
 .../Properties/AssemblyInfo.cs  |  4 +-
 modules/rest-http/pom.xml   |  2 +-
 modules/scalar-2.10/pom.xml |  2 +-
 modules/scalar/pom.xml  |  2 +-
 modules/schedule/pom.xml|  2 +-
 modules/schema-import/pom.xml   |  2 +-
 modules/slf4j/pom.xml   |  2 +-
 modules/spark-2.10/pom.xml  |  2 +-
 modules/spark/pom.xml   |  2 +-
 modules/spring/pom.xml  |  2 +-
 modules/ssh/pom.xml |  2 +-
 modules/tools/pom.xml   |  2 +-
 modules/twitter/pom.xml |  2 +-
 modules/urideploy/pom.xml   |  2 +-
 modules/visor-console-2.10/pom.xml  |  2 +-
 modules/visor-console/pom.xml   |  2 +-
 modules/visor-plugins/pom.xml   |  2 +-
 modules/web/pom.xml |  2 +-
 modules/yardstick/pom.xml   |  2 +-
 modules/yarn/pom.xml|  2 +-
 modules/zookeeper/pom.xml   |  2 +-
 pom.xml |  2 +-
 67 files changed, 142 insertions(+), 106 deletions(-)
--

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

[vozerov]

Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5


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

Branch: refs/heads/ignite-1.5
Commit: c930e7d04ba6c5cb579ec04ccee0de82287b661d
Parents: 9588124 0c550aa
Author: vozerov-gridgain 
Authored: Tue Dec 15 12:09:34 2015 +0300
Committer: vozerov-gridgain 
Committed: Tue Dec 15 12:09:34 2015 +0300

--
 .../cache/IgnitePutGetBatchBenchmark.java   | 61 ++
 .../cache/IgnitePutGetTxBatchBenchmark.java | 87 
 2 files changed, 148 insertions(+)
--

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

[vozerov]

Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5


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

Branch: refs/heads/ignite-1.5
Commit: e45f8ae2b0f3da501b1c46a7800d998788306e6a
Parents: 90b928d 7c4d16e
Author: vozerov-gridgain 
Authored: Tue Dec 15 14:26:42 2015 +0300
Committer: vozerov-gridgain 
Committed: Tue Dec 15 14:26:42 2015 +0300

--
 .../processors/cache/query/GridCacheQueryRequest.java   | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)
--

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

[av]

Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5


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

Branch: refs/heads/ignite-1.5
Commit: eb6a87ab6acc2dad2aacfdf8865b45e614a3ef49
Parents: 4b3fcfb 98a87c4
Author: Anton Vinogradov 
Authored: Tue Dec 15 15:22:15 2015 +0300
Committer: Anton Vinogradov 
Committed: Tue Dec 15 15:22:15 2015 +0300

--
 bin/ignitevisorcmd.bat | 1 +
 1 file changed, 1 insertion(+)
--

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

[sboikov]

Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5


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

Branch: refs/heads/ignite-1.5
Commit: c04106b6df7de19d4a8b36b7c56806aeef74920e
Parents: 4c829d6 e2a0390
Author: sboikov 
Authored: Tue Dec 15 14:58:53 2015 +0300
Committer: sboikov 
Committed: Tue Dec 15 14:58:53 2015 +0300

--
 .../core/src/main/java/org/apache/ignite/cache/CacheManager.java   | 2 ++
 1 file changed, 2 insertions(+)
--

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

[vozerov]

Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5


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

Branch: refs/heads/ignite-1.5
Commit: f3cc98b189dd4c4a4ad6325e6b9a6fa6db795099
Parents: fdea7cf 345fc27
Author: vozerov-gridgain 
Authored: Mon Dec 14 12:21:38 2015 +0300
Committer: vozerov-gridgain 
Committed: Mon Dec 14 12:21:38 2015 +0300

--
 .../apache/ignite/internal/IgniteKernal.java|  26 ++-
 .../resources/META-INF/classnames.properties|  68 ---
 .../cache/GridCacheAbstractFullApiSelfTest.java |  25 ++-
 ...ContinuousQueryFailoverAbstractSelfTest.java | 186 ++-
 .../tcp/TcpClientDiscoverySpiMulticastTest.java |  10 +-
 .../query/IgniteSqlSplitterSelfTest.java|   4 +-
 .../ignite/internal/GridFactorySelfTest.java|  16 ++
 7 files changed, 203 insertions(+), 132 deletions(-)
--

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

[sboikov]

Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5


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

Branch: refs/heads/ignite-1.5
Commit: 68d317952485dd0a4e09844a9cdbb3a0f23ae399
Parents: 6bf716a f87b80f
Author: sboikov 
Authored: Mon Dec 14 12:43:14 2015 +0300
Committer: sboikov 
Committed: Mon Dec 14 12:43:14 2015 +0300

--
 .../binary/BinaryMarshallerSelfTest.java| 42 
 .../cpp/core/include/ignite/ignition.h  | 41 ++-
 .../dotnet/Apache.Ignite.Core/Impl/Ignite.cs|  8 
 3 files changed, 12 insertions(+), 79 deletions(-)
--

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

[sboikov]

Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5


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

Branch: refs/heads/ignite-1.5
Commit: 72e5b9adfdcfcad4b0002bbfc1cf20fd3a0ed149
Parents: beb64c3 de0b1ba
Author: sboikov 
Authored: Mon Dec 14 11:34:32 2015 +0300
Committer: sboikov 
Committed: Mon Dec 14 11:34:32 2015 +0300

--
 .../resources/META-INF/classnames.properties| 68 +---
 1 file changed, 44 insertions(+), 24 deletions(-)
--

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

[sboikov]

Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5


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

Branch: refs/heads/ignite-1.5
Commit: ec2a64714c176f3a5aca60a058686d3354dc6a76
Parents: acb57c5 3db1448
Author: sboikov 
Authored: Mon Dec 14 10:41:18 2015 +0300
Committer: sboikov 
Committed: Mon Dec 14 10:41:18 2015 +0300

--
 .../ignite/internal/binary/BinaryUtils.java  | 19 ---
 .../binary/BinaryObjectBuilderSelfTest.java  | 10 +-
 .../binary/GridBinaryWildcardsSelfTest.java  | 16 
 3 files changed, 29 insertions(+), 16 deletions(-)
--

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

[sboikov]

Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5


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

Branch: refs/heads/ignite-1.5
Commit: f80637fdbfa2027722d5dea7bac1ce7475a92ff7
Parents: 959c4d0 6d7a6ea
Author: Anton Vinogradov 
Authored: Thu Dec 10 12:34:56 2015 +0300
Committer: Anton Vinogradov 
Committed: Thu Dec 10 12:34:56 2015 +0300

--
 .../ignite/binary/BinaryCollectionFactory.java  |  33 +
 .../apache/ignite/binary/BinaryMapFactory.java  |  33 +
 .../apache/ignite/binary/BinaryRawReader.java   |   8 +-
 .../org/apache/ignite/binary/BinaryReader.java  |   9 +-
 .../internal/portable/BinaryFieldAccessor.java  |  19 +--
 .../internal/portable/BinaryReaderExImpl.java   | 107 +++---
 .../internal/portable/BinaryWriteMode.java  |   3 -
 .../internal/portable/BinaryWriterExImpl.java   |  45 ++
 .../portable/GridPortableMarshaller.java|  21 ---
 .../portable/PortableClassDescriptor.java   |   7 +-
 .../internal/portable/PortableContext.java  |  71 -
 .../ignite/internal/portable/PortableUtils.java | 144 +--
 .../portable/builder/PortableBuilderReader.java |  12 --
 .../builder/PortableBuilderSerializer.java  |  17 +--
 .../portable/builder/PortableLazyMapEntry.java  |  68 -
 .../portable/BinaryMarshallerSelfTest.java  | 127 +++-
 .../BinaryObjectBuilderAdditionalSelfTest.java  | 101 ++---
 .../mutabletest/GridPortableTestClasses.java|  77 +++---
 ...niteCacheClientNodeChangingTopologyTest.java | 125 ++--
 .../src/binary_reader_writer_raw_test.cpp   |  10 +-
 .../core-test/src/binary_reader_writer_test.cpp |  10 +-
 .../core/include/ignite/binary/binary_consts.h  |  29 +---
 .../Impl/Binary/BinaryObjectBuilder.cs  |   8 +-
 .../Impl/Binary/BinarySystemHandlers.cs |  27 +---
 .../Impl/Binary/BinaryUtils.cs  |  93 ++--
 25 files changed, 580 insertions(+), 624 deletions(-)
--

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

[sboikov]

Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5


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

Branch: refs/heads/ignite-1.5
Commit: f24749e2cc2880715765096b755806a6c48a8356
Parents: f4ad128 f80637f
Author: sboikov 
Authored: Thu Dec 10 12:44:11 2015 +0300
Committer: sboikov 
Committed: Thu Dec 10 12:44:11 2015 +0300

--
 ...idCacheReplicatedUnswapAdvancedSelfTest.java | 42 +--
 .../GridCacheReplicatedPreloadSelfTest.java | 44 +---
 .../tests/p2p/CacheDeploymentTestValue3.java| 41 ++
 3 files changed, 61 insertions(+), 66 deletions(-)
--

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

[sboikov]

Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5


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

Branch: refs/heads/ignite-1.5
Commit: 18fef56c2036b1d6fba8792522ea79d827e65aac
Parents: 09c9a0b d2008c5
Author: sboikov 
Authored: Thu Dec 10 13:24:30 2015 +0300
Committer: sboikov 
Committed: Thu Dec 10 13:24:30 2015 +0300

--
 .../configuration/IgniteConfiguration.java  |   2 +-
 .../portable/PortableClassDescriptor.java   |  14 +-
 .../portable/BinaryMarshallerSelfTest.java  | 198 +++
 .../GridPortableAffinityKeySelfTest.java|   2 +-
 ...CacheClientNodeBinaryObjectMetadataTest.java |   2 +-
 ...ridCacheAffinityRoutingPortableSelfTest.java |   2 +-
 6 files changed, 211 insertions(+), 9 deletions(-)
--

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

[sboikov]

Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5


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

Branch: refs/heads/ignite-1.5
Commit: 388c173651781232205e545453cfdaf636e11a31
Parents: 46872d6 2e68a87
Author: sboikov 
Authored: Thu Dec 10 16:45:34 2015 +0300
Committer: sboikov 
Committed: Thu Dec 10 16:45:34 2015 +0300

--
 .../examples/datagrid/CacheTransactionExample.java   |  4 ++--
 .../apache/ignite/internal/util/nio/GridNioServer.java   | 11 +--
 2 files changed, 7 insertions(+), 8 deletions(-)
--

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

[akuznetsov]

Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5


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

Branch: refs/heads/ignite-1.5
Commit: 3ba7e541caa8f2dd2c4301203b07bfc58ef4cabb
Parents: e0ffc29 afbb0dc
Author: Alexey Kuznetsov 
Authored: Wed Dec 9 17:53:04 2015 +0700
Committer: Alexey Kuznetsov 
Committed: Wed Dec 9 17:53:04 2015 +0700

--
 .../portable/PortableClassDescriptor.java   | 46 ++--
 .../portable/BinaryMarshallerSelfTest.java  | 14 +-
 2 files changed, 36 insertions(+), 24 deletions(-)
--

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

[sboikov]

Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5


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

Branch: refs/heads/ignite-1.5
Commit: e2316ff9160ef8e54f8edeed47d02a0976edcac8
Parents: 637b79a 049f5be
Author: Anton Vinogradov 
Authored: Wed Dec 9 18:19:18 2015 +0300
Committer: Anton Vinogradov 
Committed: Wed Dec 9 18:19:18 2015 +0300

--
 .../src/main/java/org/apache/ignite/thread/IgniteThread.java   | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)
--

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

[sergi]

Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5


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

Branch: refs/heads/ignite-1.5
Commit: c292748013acfcbf6b3752183a34bb26de16c1f4
Parents: 322a85a 5cd0039
Author: S.Vladykin 
Authored: Tue Dec 8 13:18:30 2015 +0300
Committer: S.Vladykin 
Committed: Tue Dec 8 13:18:30 2015 +0300

--
 examples/pom.xml|  2 +-
 examples/schema-import/pom.xml  |  2 +-
 modules/aop/pom.xml |  2 +-
 modules/apache-license-gen/pom.xml  |  2 +-
 modules/aws/pom.xml |  2 +-
 modules/camel/pom.xml   |  2 +-
 modules/clients/pom.xml |  2 +-
 modules/cloud/pom.xml   |  2 +-
 modules/codegen/pom.xml |  2 +-
 modules/core/pom.xml|  2 +-
 .../apache/ignite/internal/GridComponent.java   |  3 +-
 .../ignite/internal/GridPluginComponent.java|  4 +-
 .../apache/ignite/internal/IgniteKernal.java| 18 +++-
 .../internal/managers/GridManagerAdapter.java   |  5 +-
 .../deployment/GridDeploymentManager.java   |  5 +-
 .../processors/GridProcessorAdapter.java|  5 +-
 .../processors/cache/GridCacheContext.java  |  6 +-
 .../processors/cache/GridCacheProcessor.java| 26 +-
 .../datastructures/DataStructuresProcessor.java |  4 +-
 .../core/src/main/resources/ignite.properties   |  2 +-
 .../IgniteClientReconnectAbstractTest.java  | 95 +---
 .../IgniteClientReconnectAtomicsTest.java   | 57 
 .../IgniteClientReconnectCacheTest.java |  5 +-
 .../IgniteClientReconnectCollectionsTest.java   | 51 +++
 .../DataStreamProcessorSelfTest.java| 25 +++---
 modules/extdata/p2p/pom.xml |  2 +-
 .../extdata/uri/modules/uri-dependency/pom.xml  |  2 +-
 modules/extdata/uri/pom.xml |  2 +-
 modules/flume/pom.xml   |  2 +-
 modules/gce/pom.xml |  2 +-
 modules/geospatial/pom.xml  |  2 +-
 modules/hadoop/pom.xml  |  2 +-
 modules/hibernate/pom.xml   |  2 +-
 modules/indexing/pom.xml|  2 +-
 modules/jcl/pom.xml |  2 +-
 modules/jms11/pom.xml   |  2 +-
 modules/jta/pom.xml |  2 +-
 modules/kafka/pom.xml   |  2 +-
 modules/log4j/pom.xml   |  2 +-
 modules/log4j2/pom.xml  |  2 +-
 modules/mesos/pom.xml   |  2 +-
 modules/mqtt/pom.xml|  2 +-
 modules/osgi-karaf/pom.xml  |  5 +-
 modules/osgi-paxlogging/pom.xml |  6 +-
 modules/osgi/pom.xml|  5 +-
 modules/platforms/cpp/common/configure.ac   |  2 +-
 modules/platforms/cpp/core-test/configure.ac|  2 +-
 modules/platforms/cpp/core/configure.ac |  2 +-
 modules/platforms/cpp/examples/configure.ac |  2 +-
 modules/platforms/cpp/ignite/configure.ac   |  2 +-
 .../Properties/AssemblyInfo.cs  |  4 +-
 .../Properties/AssemblyInfo.cs  |  4 +-
 .../Properties/AssemblyInfo.cs  |  4 +-
 .../Properties/AssemblyInfo.cs  |  4 +-
 .../Apache.Ignite/Properties/AssemblyInfo.cs|  4 +-
 .../Properties/AssemblyInfo.cs  |  4 +-
 .../Properties/AssemblyInfo.cs  |  4 +-
 modules/rest-http/pom.xml   |  2 +-
 modules/scalar-2.10/pom.xml |  2 +-
 modules/scalar/pom.xml  |  2 +-
 modules/schedule/pom.xml|  2 +-
 modules/schema-import/pom.xml   |  2 +-
 modules/slf4j/pom.xml   |  2 +-
 modules/spark-2.10/pom.xml  |  2 +-
 modules/spark/pom.xml   |  2 +-
 modules/spring/pom.xml  |  2 +-
 modules/ssh/pom.xml |  2 +-
 modules/tools/pom.xml   |  2 +-
 modules/twitter/pom.xml |  2 +-
 modules/urideploy/pom.xml   |  2 +-
 modules/visor-console-2.10/pom.xml  |  2 +-
 modules/visor-console/pom.xml   |  2 +-
 modules/visor-plugins/pom.xml   |  2 +-
 modules/web/pom.xml |  2 +-
 modules/yardstick/pom.xml   |  2 

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

[sboikov]

Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5


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

Branch: refs/heads/ignite-1.5
Commit: 5beed16e3af924e367dffec841d39d09d326d110
Parents: dc0131d 50f6c01
Author: Anton Vinogradov 
Authored: Thu Dec 3 16:54:50 2015 +0300
Committer: Anton Vinogradov 
Committed: Thu Dec 3 16:54:50 2015 +0300

--
 .../internal/portable/BinaryReaderExImpl.java   |   2 +-
 .../internal/portable/PortableContext.java  |  34 +-
 .../processors/cache/GridCacheContext.java  |  30 ++
 .../CacheDataStructuresManager.java |  31 +-
 .../dht/atomic/GridDhtAtomicCache.java  |  20 +-
 .../CacheObjectBinaryProcessorImpl.java |   8 +
 .../cache/query/GridCacheQueryManager.java  |  12 +-
 .../transactions/IgniteTxLocalAdapter.java  |  11 +-
 .../datastructures/CollocatedQueueItemKey.java  |  75 
 .../datastructures/CollocatedSetItemKey.java|  87 +
 .../datastructures/DataStructuresProcessor.java |   7 +-
 .../GridAtomicCacheQueueImpl.java   |   8 +-
 .../datastructures/GridCacheQueueAdapter.java   |  30 +-
 .../datastructures/GridCacheQueueItemKey.java   |   9 +-
 .../datastructures/GridCacheSetImpl.java|  37 +-
 .../datastructures/GridCacheSetItemKey.java |  21 +-
 .../GridTransactionalCacheQueueImpl.java|   2 +-
 .../processors/datastructures/QueueItemKey.java |  27 ++
 .../processors/datastructures/SetItemKey.java   |  36 ++
 .../cache/IgniteCacheInvokeAbstractTest.java| 369 ++-
 ...eAbstractDataStructuresFailoverSelfTest.java |   7 +-
 .../GridCacheQueueApiSelfAbstractTest.java  |  18 +-
 .../GridCacheSetFailoverAbstractSelfTest.java   |   6 +-
 .../GridCachePartitionedQueueApiSelfTest.java   |   5 +
 ...dCachePartitionedQueueEntryMoveSelfTest.java |   2 +-
 .../IgnitePartitionedQueueNoBackupsTest.java|  92 +
 .../GridCacheReplicatedQueueApiSelfTest.java|   5 +
 .../GridCacheWriteBehindStoreAbstractTest.java  |   2 +-
 .../IgniteCacheDataStructuresSelfTestSuite.java |   3 +
 29 files changed, 778 insertions(+), 218 deletions(-)
--

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

[sboikov]

Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5


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

Branch: refs/heads/ignite-1.5
Commit: b64100a32029723e5cbc94dd09fde24f78143cc9
Parents: 3492dea 9830300
Author: sboikov 
Authored: Tue Dec 1 12:19:47 2015 +0300
Committer: sboikov 
Committed: Tue Dec 1 12:19:47 2015 +0300

--
 RELEASE_NOTES.txt | 2 ++
 1 file changed, 2 insertions(+)
--

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

[vozerov]

Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5


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

Branch: refs/heads/ignite-1.5
Commit: 56aeea3d1f519229ad7ce80992a23bf367ef72c1
Parents: fc10b3e e519c2f
Author: vozerov-gridgain 
Authored: Fri Nov 27 16:48:28 2015 +0300
Committer: vozerov-gridgain 
Committed: Fri Nov 27 16:48:28 2015 +0300

--
 .../hibernate/CacheHibernatePersonStore.java|   4 +-
 .../hibernate/CacheHibernateStoreExample.java   |   2 +-
 .../datagrid/store/hibernate/Person.hbm.xml |   2 +-
 .../apache/ignite/examples/binary/Address.java  |  72 -
 .../apache/ignite/examples/binary/Employee.java |  93 ---
 .../ignite/examples/binary/EmployeeKey.java |  93 ---
 .../ignite/examples/binary/Organization.java|  93 ---
 .../examples/binary/OrganizationType.java   |  32 
 ...ComputeClientBinaryTaskExecutionExample.java |   4 +-
 .../CacheClientBinaryPutGetExample.java |   6 +-
 .../datagrid/CacheClientBinaryQueryExample.java |  22 +--
 .../examples/datagrid/CacheQueryExample.java| 161 ---
 .../ignite/examples/datagrid/store/Person.java  | 154 --
 .../store/auto/CacheAutoStoreExample.java   |   4 +-
 .../auto/CacheAutoStoreLoadDataExample.java |   4 +-
 .../datagrid/store/auto/CacheConfig.java|   6 +-
 .../store/dummy/CacheDummyPersonStore.java  |  12 +-
 .../store/dummy/CacheDummyStoreExample.java |   4 +-
 .../store/jdbc/CacheJdbcPersonStore.java|  18 +--
 .../store/jdbc/CacheJdbcStoreExample.java   |   4 +-
 .../store/spring/CacheSpringPersonStore.java|  10 +-
 .../store/spring/CacheSpringStoreExample.java   |   4 +-
 .../ignite/examples/model/Organization.java |  55 +++
 .../apache/ignite/examples/model/Person.java| 120 ++
 .../ignite/examples/model/binary/Address.java   |  72 +
 .../ignite/examples/model/binary/Employee.java  |  93 +++
 .../examples/model/binary/EmployeeKey.java  |  93 +++
 .../examples/model/binary/Organization.java |  93 +++
 .../examples/model/binary/OrganizationType.java |  32 
 .../examples/ScalarCacheQueryExample.scala  |  66 ++--
 30 files changed, 651 insertions(+), 777 deletions(-)
--

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

[sboikov]

Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5


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

Branch: refs/heads/ignite-1.5
Commit: 6312737a72b95efb417019ea13f9a811b9f3adf4
Parents: 9b01be3 56aeea3
Author: sboikov 
Authored: Fri Nov 27 16:54:42 2015 +0300
Committer: sboikov 
Committed: Fri Nov 27 16:54:42 2015 +0300

--
 .../hibernate/CacheHibernatePersonStore.java|   4 +-
 .../hibernate/CacheHibernateStoreExample.java   |   2 +-
 .../datagrid/store/hibernate/Person.hbm.xml |   2 +-
 .../apache/ignite/examples/binary/Address.java  |  72 -
 .../apache/ignite/examples/binary/Employee.java |  93 ---
 .../ignite/examples/binary/EmployeeKey.java |  93 ---
 .../ignite/examples/binary/Organization.java|  93 ---
 .../examples/binary/OrganizationType.java   |  32 
 ...ComputeClientBinaryTaskExecutionExample.java |   4 +-
 .../CacheClientBinaryPutGetExample.java |   6 +-
 .../datagrid/CacheClientBinaryQueryExample.java |  22 +--
 .../examples/datagrid/CacheQueryExample.java| 161 ---
 .../ignite/examples/datagrid/store/Person.java  | 154 --
 .../store/auto/CacheAutoStoreExample.java   |   4 +-
 .../auto/CacheAutoStoreLoadDataExample.java |   4 +-
 .../datagrid/store/auto/CacheConfig.java|   6 +-
 .../store/dummy/CacheDummyPersonStore.java  |  12 +-
 .../store/dummy/CacheDummyStoreExample.java |   4 +-
 .../store/jdbc/CacheJdbcPersonStore.java|  18 +--
 .../store/jdbc/CacheJdbcStoreExample.java   |   4 +-
 .../store/spring/CacheSpringPersonStore.java|  10 +-
 .../store/spring/CacheSpringStoreExample.java   |   4 +-
 .../ignite/examples/model/Organization.java |  55 +++
 .../apache/ignite/examples/model/Person.java| 120 ++
 .../ignite/examples/model/binary/Address.java   |  72 +
 .../ignite/examples/model/binary/Employee.java  |  93 +++
 .../examples/model/binary/EmployeeKey.java  |  93 +++
 .../examples/model/binary/Organization.java |  93 +++
 .../examples/model/binary/OrganizationType.java |  32 
 .../examples/ScalarCacheQueryExample.scala  |  66 ++--
 .../processors/query/h2/IgniteH2Indexing.java   |  24 ++-
 31 files changed, 667 insertions(+), 785 deletions(-)
--

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

[sboikov]

Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5


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

Branch: refs/heads/ignite-1.5
Commit: 30c9b8dbdff3f635525c4d8a3d6442ef2e87b754
Parents: 60d9ddc bde1d1d
Author: Anton Vinogradov 
Authored: Fri Nov 27 12:29:42 2015 +0300
Committer: Anton Vinogradov 
Committed: Fri Nov 27 12:29:42 2015 +0300

--
 modules/yarn/pom.xml |  6 +++---
 .../ignite/yarn/IgniteApplicationMasterSelfTest.java | 11 +--
 2 files changed, 12 insertions(+), 5 deletions(-)
--

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

[sboikov]

Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5


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

Branch: refs/heads/ignite-1.5
Commit: e706216a5b2540f9f258dd41e49e98b4fac575a0
Parents: 96efa38 19680d6
Author: sboikov 
Authored: Fri Nov 27 10:09:48 2015 +0300
Committer: sboikov 
Committed: Fri Nov 27 10:09:48 2015 +0300

--
 .../org/apache/ignite/internal/GridMultipleJobsSelfTest.java  | 7 +++
 1 file changed, 7 insertions(+)
--

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

[vozerov]

Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5


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

Branch: refs/heads/ignite-1.5
Commit: 446a14bf67f81d01e439867e5a3783cab4d59275
Parents: 0a97c1c f2092e7
Author: vozerov-gridgain 
Authored: Thu Nov 26 12:42:33 2015 +0300
Committer: vozerov-gridgain 
Committed: Thu Nov 26 12:42:33 2015 +0300

--
 .../config/binary/example-ignite-binary.xml |  44 --
 examples/config/example-ignite.xml  |  10 +-
 .../ignite/examples/binary/EmployeeKey.java |   3 +
 .../binary/ExampleBinaryNodeStartup.java|  36 -
 ...ComputeClientBinaryTaskExecutionExample.java |   6 +-
 .../CacheClientBinaryPutGetExample.java |   6 +-
 .../datagrid/CacheClientBinaryQueryExample.java |   6 +-
 .../scalar/examples/ScalarCacheExample.scala|  19 ++-
 .../ignite/codegen/MessageCodeGenerator.java|   1 +
 .../java/org/apache/ignite/IgniteBinary.java|   5 +-
 .../java/org/apache/ignite/IgniteCache.java |   3 +-
 .../apache/ignite/binary/BinaryIdMapper.java|   3 +-
 .../apache/ignite/cache/CacheTypeMetadata.java  |   2 +
 .../store/jdbc/CacheAbstractJdbcStore.java  |   2 +-
 .../configuration/CacheConfiguration.java   |   6 +-
 .../internal/GridEventConsumeHandler.java   |   5 +
 .../internal/GridMessageListenHandler.java  |   5 +
 .../apache/ignite/internal/IgniteKernal.java|   2 +-
 .../org/apache/ignite/internal/IgnitionEx.java  |   6 +-
 .../ignite/internal/NodeStoppingException.java  |  35 +
 .../internal/portable/BinaryMarshaller.java | 144 ++
 .../portable/PortableClassDescriptor.java   |   2 +-
 .../internal/portable/PortableContext.java  |  35 -
 .../builder/BinaryObjectBuilderImpl.java|   9 +-
 .../processors/cache/CacheObjectContext.java|   2 +-
 .../cache/GridCacheDeploymentManager.java   |   6 +-
 .../processors/cache/GridCacheEventManager.java |  38 -
 .../processors/cache/GridCacheIoManager.java|   6 +
 .../processors/cache/GridCacheMessage.java  |   3 +-
 .../processors/cache/GridCacheMvccManager.java  |   3 +-
 .../processors/cache/GridCacheProcessor.java|  11 +-
 .../processors/cache/IgniteCacheProxy.java  |  14 +-
 .../cache/affinity/GridCacheAffinityImpl.java   |   3 +-
 .../distributed/dht/GridDhtLockFuture.java  |  19 +--
 .../distributed/dht/GridDhtTxFinishFuture.java  |   1 +
 .../dht/GridPartitionedSingleGetFuture.java |   3 +-
 .../dht/atomic/GridDhtAtomicUpdateRequest.java  |   2 +-
 .../dht/atomic/GridNearAtomicUpdateFuture.java  |   3 +-
 .../CacheObjectBinaryProcessorImpl.java |  30 +++-
 .../continuous/CacheContinuousQueryEntry.java   |  50 +--
 .../continuous/CacheContinuousQueryEvent.java   |   6 +-
 .../continuous/CacheContinuousQueryHandler.java |  32 +++-
 .../CacheContinuousQueryListener.java   |   5 +
 .../continuous/CacheContinuousQueryManager.java |  57 +---
 .../cache/store/CacheOsStoreManager.java|   2 +-
 .../transactions/IgniteTxLocalAdapter.java  |  29 +++-
 .../continuous/GridContinuousHandler.java   |   5 +
 .../continuous/GridContinuousProcessor.java |  10 +-
 .../StartRoutineDiscoveryMessage.java   |  13 +-
 .../cpp/PlatformCppConfigurationClosure.java|   2 +-
 .../PlatformDotNetConfigurationClosure.java |   2 +-
 .../processors/query/GridQueryProcessor.java|  28 +++-
 .../marshaller/portable/BinaryMarshaller.java   | 146 ---
 ...heJdbcPojoStoreBinaryMarshallerSelfTest.java |  85 +++
 ...JdbcPojoStorePortableMarshallerSelfTest.java |  85 ---
 .../portable/BinaryFieldsAbstractSelfTest.java  |   1 -
 .../portable/BinaryFieldsHeapSelfTest.java  |   2 -
 .../portable/BinaryFieldsOffheapSelfTest.java   |   1 -
 .../BinaryFooterOffsetsAbstractSelfTest.java|   1 -
 .../BinaryFooterOffsetsHeapSelfTest.java|   2 -
 .../BinaryFooterOffsetsOffheapSelfTest.java |   1 -
 .../portable/BinaryMarshallerSelfTest.java  |   1 -
 .../BinaryObjectBuilderAdditionalSelfTest.java  |   1 -
 .../portable/BinaryObjectBuilderSelfTest.java   |  31 +++-
 .../GridPortableAffinityKeySelfTest.java|  13 +-
 ...idPortableMarshallerCtxDisabledSelfTest.java |   1 -
 .../portable/GridPortableMetaDataSelfTest.java  |   1 -
 .../portable/GridPortableWildcardsSelfTest.java |   1 -
 .../cache/GridCacheAbstractFullApiSelfTest.java |  97 
 ...IgniteCacheAbstractExecutionContextTest.java |   2 +-
 .../IgniteCachePutRetryAbstractSelfTest.java|   2 +
 ...naryObjectsAbstractDataStreamerSelfTest.java |   2 +-
 ...aryObjectsAbstractMultiThreadedSelfTest.java |   2 

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

[sboikov]

Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5


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

Branch: refs/heads/ignite-1.5
Commit: e8a14dabe0029e3ff6a4be4e49f409c73e304f9a
Parents: be505f4 e386798
Author: sboikov 
Authored: Thu Nov 26 12:56:04 2015 +0300
Committer: sboikov 
Committed: Thu Nov 26 12:56:04 2015 +0300

--
 .../src/main/java/org/apache/ignite/IgniteBinary.java | 10 +-
 .../main/java/org/apache/ignite/binary/BinaryObject.java  |  2 +-
 .../main/java/org/apache/ignite/binary/BinaryType.java|  2 +-
 .../processors/cache/portable/IgniteBinaryImpl.java   |  9 +
 .../internal/processors/cacheobject/NoOpBinary.java   |  8 
 .../portable/BinaryObjectBuilderAdditionalSelfTest.java   |  6 +++---
 .../internal/portable/GridPortableMetaDataSelfTest.java   | 10 +-
 ...dCacheClientNodeBinaryObjectMetadataMultinodeTest.java |  8 
 .../GridCacheClientNodeBinaryObjectMetadataTest.java  |  4 ++--
 .../platform/PlatformComputeBinarizableArgTask.java   |  2 +-
 .../Apache.Ignite.Core.Tests/Examples/ExamplesTest.cs |  5 -
 .../Apache.Ignite.Examples/Messaging/MessagingExample.cs  |  9 +++--
 12 files changed, 42 insertions(+), 33 deletions(-)
--

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

[sboikov]

Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5


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

Branch: refs/heads/ignite-1.5
Commit: c584ccae974cde2221220cc5daade57844f37132
Parents: c3eeb6d dae1b87
Author: sboikov 
Authored: Thu Nov 26 13:31:03 2015 +0300
Committer: sboikov 
Committed: Thu Nov 26 13:31:03 2015 +0300

--
 .../ignite/internal/processors/cache/GridCacheIoManager.java  | 2 --
 .../ignite/internal/processors/cache/GridCacheProcessor.java  | 7 ---
 .../cache/distributed/dht/GridPartitionedSingleGetFuture.java | 1 -
 3 files changed, 10 deletions(-)
--

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

[akuznetsov]

Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5


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

Branch: refs/heads/ignite-1.5
Commit: e4109f9800baa5b0783755cf537c46000ffd4305
Parents: fe53753 aee7b75
Author: AKuznetsov 
Authored: Mon Nov 23 22:08:35 2015 +0700
Committer: AKuznetsov 
Committed: Mon Nov 23 22:08:35 2015 +0700

--
 .../internal/GridEventConsumeHandler.java   |6 +-
 .../internal/GridMessageListenHandler.java  |6 +-
 .../internal/portable/BinaryObjectImpl.java |   32 +-
 .../portable/BinaryObjectOffheapImpl.java   |   27 +-
 .../internal/portable/BinaryReaderExImpl.java   | 1015 ++
 .../portable/BinaryReaderHandlesHolder.java |   46 +
 .../portable/BinaryReaderHandlesHolderImpl.java |   44 +
 .../portable/GridPortableMarshaller.java|   23 +-
 .../portable/PortableClassDescriptor.java   |8 +-
 .../ignite/internal/portable/PortableUtils.java |  861 ++-
 .../portable/builder/PortableBuilderReader.java |   21 +-
 .../processors/cache/GridCacheMapEntry.java |3 +-
 .../continuous/CacheContinuousQueryHandler.java |7 +-
 .../continuous/GridContinuousHandler.java   |6 +-
 .../continuous/GridContinuousProcessor.java |   50 +-
 .../platform/PlatformContextImpl.java   |4 +-
 ...chePartitionedAtomicSetFailoverSelfTest.java |5 +
 ...ContinuousQueryFailoverAbstractSelfTest.java |2 +-
 .../continuous/GridEventConsumeSelfTest.java|2 +-
 .../IgniteAtomicInvokeRetryBenchmark.java   |2 +-
 .../failover/IgniteConsistencyException.java|   64 ++
 ...IgniteTransactionalInvokeRetryBenchmark.java |2 +-
 ...IgniteTransactionalWriteInvokeBenchmark.java |  135 ++-
 .../IgniteTransactionalWriteReadBenchmark.java  |2 +-
 24 files changed, 1312 insertions(+), 1061 deletions(-)
--

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

[sboikov]

Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5


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

Branch: refs/heads/ignite-1.5
Commit: e369e1fe797ac3309cf3eee74a7bacd3c1ad0565
Parents: dae3de0 f0db0d9
Author: Anton Vinogradov 
Authored: Thu Nov 19 17:42:40 2015 +0300
Committer: Anton Vinogradov 
Committed: Thu Nov 19 17:42:40 2015 +0300

--
 .../java/org/apache/ignite/IgniteCache.java |   3 +-
 .../java/org/apache/ignite/IgniteCompute.java   |   3 +-
 .../org/apache/ignite/compute/ComputeJob.java   |   2 +-
 .../communication/GridIoMessageFactory.java |  12 +
 .../processors/cache/GridCacheAdapter.java  | 103 ++-
 .../processors/cache/GridCacheAtomicFuture.java |   6 +
 .../processors/cache/GridCacheFuture.java   |  13 -
 .../processors/cache/GridCacheIoManager.java|  50 +-
 .../processors/cache/GridCacheMessage.java  |  20 +-
 .../processors/cache/GridCacheMvccFuture.java   |   7 +
 .../processors/cache/GridCacheMvccManager.java  | 108 +--
 .../distributed/GridCacheTxRecoveryFuture.java  |  13 +-
 .../dht/CacheDistributedGetFutureAdapter.java   |  27 +-
 .../cache/distributed/dht/CacheGetFuture.java   |  32 +
 .../distributed/dht/GridDhtCacheAdapter.java| 141 
 .../distributed/dht/GridDhtLockFuture.java  |  16 +-
 .../dht/GridDhtTransactionalCacheAdapter.java   |   9 +-
 .../distributed/dht/GridDhtTxFinishFuture.java  |  24 +-
 .../cache/distributed/dht/GridDhtTxLocal.java   |   4 +-
 .../distributed/dht/GridDhtTxPrepareFuture.java |  17 +-
 .../dht/GridPartitionedGetFuture.java   |  69 +-
 .../dht/GridPartitionedSingleGetFuture.java | 697 +++
 .../dht/atomic/GridDhtAtomicCache.java  | 127 +++-
 .../dht/atomic/GridDhtAtomicUpdateFuture.java   |  84 +--
 .../dht/atomic/GridDhtAtomicUpdateRequest.java  |  11 +
 .../dht/atomic/GridNearAtomicUpdateFuture.java  |   5 -
 .../dht/colocated/GridDhtColocatedCache.java| 160 -
 .../colocated/GridDhtColocatedLockFuture.java   |  26 +-
 .../distributed/near/CacheVersionedValue.java   |   2 +-
 .../distributed/near/GridNearCacheAdapter.java  |   4 +-
 .../distributed/near/GridNearGetFuture.java |  57 +-
 .../distributed/near/GridNearGetRequest.java|   1 -
 .../distributed/near/GridNearGetResponse.java   |   2 -
 .../distributed/near/GridNearLockFuture.java|  16 +-
 ...arOptimisticSerializableTxPrepareFuture.java |  17 +-
 .../near/GridNearOptimisticTxPrepareFuture.java |  19 +-
 .../GridNearPessimisticTxPrepareFuture.java |  19 +-
 .../near/GridNearSingleGetRequest.java  | 396 +++
 .../near/GridNearSingleGetResponse.java | 321 +
 .../near/GridNearTransactionalCache.java|   2 +-
 .../near/GridNearTxFinishFuture.java|  24 +-
 .../cache/distributed/near/GridNearTxLocal.java | 149 ++--
 .../near/GridNearTxPrepareFutureAdapter.java|   6 +-
 .../processors/cache/local/GridLocalCache.java  |   4 +-
 .../cache/local/GridLocalLockFuture.java|   5 -
 .../cache/transactions/IgniteTxHandler.java |  19 +-
 .../transactions/IgniteTxLocalAdapter.java  |   2 +-
 .../cache/transactions/IgniteTxManager.java |   2 +-
 .../ignite/marshaller/MarshallerExclusions.java |   4 +-
 .../IgniteClientReconnectCacheTest.java |  11 +-
 .../cache/GridCacheAbstractFullApiSelfTest.java |  75 ++
 .../GridCacheConcurrentTxMultiNodeTest.java |  15 -
 .../cache/GridCachePartitionedGetSelfTest.java  |   3 +-
 .../IgniteCacheAbstractStopBusySelfTest.java|  27 +-
 .../IgniteCacheP2pUnmarshallingErrorTest.java   | 184 +++--
 .../CacheGetFutureHangsSelfTest.java|   6 +
 .../GridCacheAbstractNodeRestartSelfTest.java   |   2 +
 .../IgniteCacheSingleGetMessageTest.java| 357 ++
 .../GridCacheReplicatedMetricsSelfTest.java |   9 -
 .../testsuites/IgniteCacheTestSuite4.java   |   3 +
 60 files changed, 2915 insertions(+), 637 deletions(-)
--