You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2015/12/08 11:29:58 UTC
[16/16] ignite git commit: Merge branches 'ignite-1.5.1' and
'ignite-2093'
Merge branches 'ignite-1.5.1' and 'ignite-2093'
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7a1ee037
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7a1ee037
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7a1ee037
Branch: refs/heads/ignite-2093
Commit: 7a1ee0377c40d8e3ce3f4ea7e374dd9a9102eae5
Parents: ac9ee86 250aa4f
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Tue Dec 8 17:30:00 2015 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Tue Dec 8 17:30:00 2015 +0700
----------------------------------------------------------------------
examples/pom.xml | 4 +-
examples/schema-import/pom.xml | 4 +-
modules/aop/pom.xml | 14 ++----
modules/apache-license-gen/pom.xml | 2 +-
modules/aws/pom.xml | 20 +++------
modules/camel/pom.xml | 13 +-----
modules/clients/pom.xml | 2 +-
modules/cloud/pom.xml | 2 +-
modules/codegen/pom.xml | 2 +-
modules/core/pom.xml | 30 ++-----------
.../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 | 18 +++-----
modules/gce/pom.xml | 2 +-
modules/geospatial/pom.xml | 22 +---------
modules/hadoop/pom.xml | 4 +-
modules/hibernate/pom.xml | 12 +----
modules/indexing/pom.xml | 24 ++--------
modules/jcl/pom.xml | 13 +-----
modules/jms11/pom.xml | 22 ++++------
modules/jta/pom.xml | 19 +-------
modules/kafka/pom.xml | 18 ++------
modules/log4j/pom.xml | 12 +----
modules/log4j2/pom.xml | 13 +-----
modules/mesos/pom.xml | 2 +-
modules/mqtt/pom.xml | 26 ++++-------
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 | 36 ++++-----------
modules/scalar-2.10/pom.xml | 11 +----
modules/scalar/pom.xml | 11 +----
modules/schedule/pom.xml | 27 +-----------
modules/schema-import/pom.xml | 4 +-
modules/slf4j/pom.xml | 14 +-----
modules/spark-2.10/pom.xml | 4 +-
modules/spark/pom.xml | 2 +-
modules/spring/pom.xml | 32 ++------------
modules/ssh/pom.xml | 21 +--------
modules/tools/pom.xml | 2 +-
modules/twitter/pom.xml | 14 +-----
modules/urideploy/pom.xml | 19 ++------
modules/visor-console-2.10/pom.xml | 6 +--
modules/visor-console/pom.xml | 4 +-
modules/visor-plugins/pom.xml | 6 +--
modules/web/pom.xml | 15 +------
modules/yardstick/pom.xml | 2 +-
modules/yarn/pom.xml | 2 +-
modules/zookeeper/pom.xml | 16 +++----
pom.xml | 46 ++++++--------------
61 files changed, 151 insertions(+), 489 deletions(-)
----------------------------------------------------------------------