You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by an...@apache.org on 2015/12/23 09:30:39 UTC

[1/4] ignite git commit: IGNITE-843 Clean up.

Repository: ignite
Updated Branches:
  refs/heads/ignite-843-rc2 bdae67138 -> 8da02627f


IGNITE-843 Clean up.


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

Branch: refs/heads/ignite-843-rc2
Commit: a38f510c17a88165cf0db0437db4f256d04ccd20
Parents: 0dfdaeb
Author: Andrey <an...@gridgain.com>
Authored: Mon Dec 21 17:53:02 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Mon Dec 21 17:53:02 2015 +0700

----------------------------------------------------------------------
 modules/control-center-web/src/main/js/config.js | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/a38f510c/modules/control-center-web/src/main/js/config.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/config.js b/modules/control-center-web/src/main/js/config.js
index 3b046be..8221f3b 100644
--- a/modules/control-center-web/src/main/js/config.js
+++ b/modules/control-center-web/src/main/js/config.js
@@ -142,6 +142,9 @@ System.config({
     "github:twbs/bootstrap@3.3.6": {
       "jquery": "github:components/jquery@2.1.4"
     },
+    "github:wix/angular-tree-control@0.2.23": {
+      "angular": "github:angular/bower-angular@1.4.8"
+    },
     "npm:acorn-globals@1.0.9": {
       "acorn": "npm:acorn@2.6.4"
     },


[3/4] ignite git commit: Merge remote-tracking branch 'origin/ignite-843-rc2' into ignite-843-rc2

Posted by an...@apache.org.
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/713debb1
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/713debb1
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/713debb1

Branch: refs/heads/ignite-843-rc2
Commit: 713debb1332817c3333a09eb85c8b20f85dbb665
Parents: d49cbe2 2077162
Author: Andrey <an...@gridgain.com>
Authored: Wed Dec 23 08:39:37 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Wed Dec 23 08:39:37 2015 +0700

----------------------------------------------------------------------
 .../main/js/controllers/metadata-controller.js  | 88 ++++++++++++--------
 modules/control-center-web/src/main/js/db.js    |  1 +
 .../main/js/helpers/generator/generator-java.js |  1 +
 .../main/js/helpers/generator/generator-xml.js  |  1 +
 .../cache/VisorCacheStoreConfiguration.java     | 13 ++-
 .../commands/cache/VisorCacheCommand.scala      |  1 +
 .../config/benchmark-multicast.properties       |  2 +-
 7 files changed, 69 insertions(+), 38 deletions(-)
----------------------------------------------------------------------



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

Posted by an...@apache.org.
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/d49cbe22
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d49cbe22
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d49cbe22

Branch: refs/heads/ignite-843-rc2
Commit: d49cbe227e5edb6021357fd65a11df2999406562
Parents: a38f510 2ee4b59
Author: Andrey <an...@gridgain.com>
Authored: Tue Dec 22 13:27:09 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Tue Dec 22 13:27:09 2015 +0700

----------------------------------------------------------------------
 .../main/js/controllers/models/clusters.json    |  53 ++++
 modules/control-center-web/src/main/js/db.js    |   6 +
 .../main/js/helpers/generator/generator-java.js |  25 +-
 .../configuration/CacheConfiguration.java       |  44 ++-
 .../internal/binary/BinaryObjectImpl.java       |  20 +-
 .../discovery/GridDiscoveryManager.java         |   4 +-
 .../processors/cache/IgniteCacheProxy.java      |   5 +-
 .../dht/preloader/GridDhtPreloader.java         |  29 --
 .../cache/query/GridCacheQueryManager.java      |   8 +-
 .../processors/query/GridQueryProcessor.java    |  10 +-
 .../ignite/internal/util/IgniteUtils.java       |   6 +-
 .../cache/VisorCacheQueryConfiguration.java     |  11 +
 .../internal/visor/query/VisorQueryJob.java     |   6 +
 .../ignite/spi/discovery/tcp/ClientImpl.java    |  48 +--
 .../IgniteClientReconnectCacheTest.java         |  26 +-
 .../IgniteCacheBinaryObjectsScanSelfTest.java   | 137 +++++++++
 .../cache/IgniteCachePutAllRestartTest.java     |   2 +-
 .../processors/query/h2/IgniteH2Indexing.java   | 118 ++++++--
 .../processors/query/h2/sql/GridSqlQuery.java   |   3 +
 .../query/h2/sql/GridSqlQuerySplitter.java      | 113 ++++---
 .../cache/IgniteCacheAbstractQuerySelfTest.java | 300 +++++++++++++------
 .../IgniteCacheReplicatedQuerySelfTest.java     |  10 +-
 .../local/IgniteCacheLocalQuerySelfTest.java    |   2 +-
 .../query/IgniteSqlSchemaIndexingTest.java      | 240 +++++++++++++++
 .../query/IgniteSqlSplitterSelfTest.java        |  52 ++++
 .../query/h2/sql/GridQueryParsingTest.java      |   9 +-
 .../IgniteBinaryCacheQueryTestSuite.java        |   2 +
 .../IgniteCacheQuerySelfTestSuite.java          |   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                  |   5 +-
 .../Properties/AssemblyInfo.cs                  |   5 +-
 .../Properties/AssemblyInfo.cs                  |   5 +-
 .../Binary/IBinaryRawReader.cs                  |   4 +-
 .../Apache.Ignite.Core/Binary/IBinaryReader.cs  |  25 +-
 .../Apache.Ignite.Core/Binary/Package-Info.cs   |   2 +-
 .../Apache.Ignite.Core/Cache/Package-Info.cs    |   2 +-
 .../Cache/Query/Continuous/Package-Info.cs      |   2 +-
 .../Cache/Query/Package-Info.cs                 |   2 +-
 .../Cache/Store/Package-Info.cs                 |   2 +-
 .../Apache.Ignite.Core/Cluster/Package-Info.cs  |   2 +-
 .../Apache.Ignite.Core/Compute/Package-Info.cs  |   2 +-
 .../Datastream/Package-Info.cs                  |   2 +-
 .../Apache.Ignite.Core/Events/Package-Info.cs   |   2 +-
 .../Impl/Binary/BinaryReader.cs                 |  13 +-
 .../Impl/Binary/BinaryUtils.cs                  |   4 +-
 .../Lifecycle/Package-Info.cs                   |   2 +-
 .../Messaging/Package-Info.cs                   |   2 +-
 .../dotnet/Apache.Ignite.Core/Package-Info.cs   |   2 +-
 .../Properties/AssemblyInfo.cs                  |   5 +-
 .../Apache.Ignite.Core/Resource/Package-Info.cs |   2 +-
 .../Apache.Ignite.Core/Services/Package-Info.cs |   2 +-
 .../Transactions/Package-Info.cs                |   2 +-
 .../Apache.Ignite/Properties/AssemblyInfo.cs    |   5 +-
 .../Properties/AssemblyInfo.cs                  |   5 +-
 .../Properties/AssemblyInfo.cs                  |   5 +-
 .../commands/cache/VisorCacheCommand.scala      |  13 +-
 pom.xml                                         |  42 +--
 61 files changed, 1108 insertions(+), 359 deletions(-)
----------------------------------------------------------------------



[4/4] ignite git commit: Merge remote-tracking branch 'origin/ignite-843-rc2' into ignite-843-rc2

Posted by an...@apache.org.
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 <an...@gridgain.com>
Authored: Wed Dec 23 15:08:02 2015 +0700
Committer: Andrey <an...@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(-)
----------------------------------------------------------------------