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-1537 Commit: c292748013acfcbf6b3752183a34bb26de16c1f4 Parents: 322a85a 5cd0039 Author: S.Vladykin <svlady...@gridgain.com> Authored: Tue Dec 8 13:18:30 2015 +0300 Committer: S.Vladykin <svlady...@gridgain.com> 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 +- modules/yarn/pom.xml | 2 +- modules/zookeeper/pom.xml | 2 +- pom.xml | 6 +- 78 files changed, 345 insertions(+), 120 deletions(-) ----------------------------------------------------------------------