Merge remote-tracking branch 'origin/ignite-843-rc2' into ignite-843-rc2
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8da02627 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8da02627 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8da02627 Branch: refs/heads/ignite-843-rc2 Commit: 8da02627f5af14cea0865dbf339d7a0ce0521c0d Parents: 713debb bdae671 Author: Andrey <anovi...@gridgain.com> Authored: Wed Dec 23 15:08:02 2015 +0700 Committer: Andrey <anovi...@gridgain.com> Committed: Wed Dec 23 15:08:02 2015 +0700 ---------------------------------------------------------------------- assembly/dependencies-fabric-lgpl.xml | 7 + assembly/dependencies-fabric.xml | 7 + 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/control-center-agent/pom.xml | 2 +- modules/control-center-web/pom.xml | 2 +- .../ui-ace-pom/ui-ace-pom.controller.js | 2 +- .../main/js/controllers/clusters-controller.js | 5 + .../src/main/js/controllers/common-module.js | 2 +- .../main/js/controllers/models/clusters.json | 2 +- .../main/js/helpers/generator/generator-java.js | 12 +- .../helpers/generator/generator-properties.js | 2 +- .../main/js/helpers/generator/generator-xml.js | 10 + .../src/main/js/routes/agent.js | 2 +- modules/core/pom.xml | 2 +- .../ignite/internal/IgniteVersionUtils.java | 5 +- .../internal/binary/BinaryClassDescriptor.java | 56 +++++- .../ignite/internal/binary/BinaryUtils.java | 11 ++ .../internal/binary/GridBinaryMarshaller.java | 10 + .../processors/cache/IgniteCacheProxy.java | 3 +- .../binary/CacheObjectBinaryProcessorImpl.java | 3 + .../ignite/lang/IgniteProductVersion.java | 2 +- .../core/src/main/resources/ignite.properties | 2 +- .../binary/BinaryMarshallerSelfTest.java | 182 +++++++++++++++---- .../product/GridProductVersionSelfTest.java | 22 ++- 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 +++++++++++++++ .../IgniteBinaryCacheQueryTestSuite.java | 3 +- 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-db/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 +- .../config/benchmark-multicast.properties | 6 +- modules/yardstick/pom.xml | 2 +- .../cache/IgnitePutTxImplicitBenchmark.java | 52 ++++++ .../cache/IgnitePutTxOffHeapBenchmark.java | 2 +- .../IgnitePutTxOffHeapValuesBenchmark.java | 2 +- modules/yarn/pom.xml | 2 +- modules/zookeeper/pom.xml | 2 +- pom.xml | 4 +- 92 files changed, 569 insertions(+), 150 deletions(-) ----------------------------------------------------------------------