Merge branch 'ignite-1.5' into ignite-2100
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4d1cc92c Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4d1cc92c Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4d1cc92c Branch: refs/heads/ignite-2100 Commit: 4d1cc92c6a23ad657063841fc473595ede163930 Parents: b932135 c1e2926 Author: vozerov-gridgain <[email protected]> Authored: Thu Dec 17 15:04:20 2015 +0300 Committer: vozerov-gridgain <[email protected]> Committed: Thu Dec 17 15:04:20 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 +- .../org/apache/ignite/cache/CacheManager.java | 2 +- .../apache/ignite/internal/IgniteKernal.java | 35 +++++++------ .../org/apache/ignite/internal/IgnitionEx.java | 51 +++++++++++++++---- .../processors/cache/GridCacheUtils.java | 18 +------ .../datastreamer/DataStreamerUpdateJob.java | 2 +- .../core/src/main/resources/ignite.properties | 2 +- .../cache/CacheStopAndDestroySelfTest.java | 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 +- modules/platforms/dotnet/Apache.Ignite.dxg | 2 +- .../Apache.Ignite/Properties/AssemblyInfo.cs | 4 +- .../Messaging/MessagingExample.cs | 6 +-- .../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 +- .../java/org/apache/ignite/IgniteSpring.java | 4 +- 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 +- 74 files changed, 192 insertions(+), 125 deletions(-) ----------------------------------------------------------------------
