Repository: incubator-ignite Updated Branches: refs/heads/ignite-1000 [created] bbbcf0b88
Merge branch 'ignite-sprint-6' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-sprint-6 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2e58e52d Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2e58e52d Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2e58e52d Branch: refs/heads/ignite-1000 Commit: 2e58e52d931423bc6d61db36817e925c15dc36b8 Parents: d18536a c232631 Author: Denis Magda <[email protected]> Authored: Fri Jun 5 08:49:10 2015 +0300 Committer: Denis Magda <[email protected]> Committed: Fri Jun 5 08:49:10 2015 +0300 ---------------------------------------------------------------------- dev-tools/gradle/wrapper/gradle-wrapper.jar | Bin 51017 -> 0 bytes .../gradle/wrapper/gradle-wrapper.properties | 18 +- dev-tools/gradlew | 163 ++++-- dev-tools/slurp.sh | 10 + dev-tools/src/main/groovy/jiraslurp.groovy | 145 ++++-- examples/pom.xml | 2 +- modules/aop/pom.xml | 2 +- modules/aws/pom.xml | 2 +- modules/clients/pom.xml | 2 +- modules/cloud/pom.xml | 2 +- modules/codegen/pom.xml | 2 +- modules/core/pom.xml | 2 +- .../src/main/java/org/apache/ignite/Ignite.java | 8 +- .../java/org/apache/ignite/IgniteServices.java | 5 +- .../apache/ignite/internal/IgniteKernal.java | 4 +- .../processors/cache/IgniteCacheProxy.java | 3 +- .../GridDistributedTxRemoteAdapter.java | 10 +- .../processors/query/GridQueryIndexing.java | 16 + .../processors/query/GridQueryProcessor.java | 52 +- .../shmem/IpcSharedMemoryServerEndpoint.java | 2 +- .../org/apache/ignite/services/Service.java | 5 +- .../core/src/main/resources/ignite.properties | 2 +- .../cache/IgniteDynamicCacheStartSelfTest.java | 20 +- .../service/ClosureServiceClientsNodesTest.java | 245 +++++++++ .../ignite/testsuites/IgniteBasicTestSuite.java | 2 + modules/extdata/p2p/pom.xml | 2 +- modules/extdata/uri/pom.xml | 2 +- modules/gce/pom.xml | 2 +- modules/geospatial/pom.xml | 2 +- .../query/h2/GridH2IndexingGeoSelfTest.java | 20 +- modules/hadoop/pom.xml | 2 +- modules/hibernate/pom.xml | 2 +- modules/indexing/pom.xml | 2 +- .../processors/query/h2/IgniteH2Indexing.java | 17 + .../query/h2/opt/GridH2AbstractKeyValueRow.java | 18 +- .../query/h2/opt/GridH2KeyValueRowOffheap.java | 4 +- .../query/h2/sql/GridSqlOperationType.java | 2 +- .../query/h2/sql/GridSqlQuerySplitter.java | 4 + .../h2/twostep/GridReduceQueryExecutor.java | 2 +- .../IgniteCacheQueryMultiThreadedSelfTest.java | 2 +- .../local/IgniteCacheLocalQuerySelfTest.java | 6 + .../query/h2/sql/BaseH2CompareQueryTest.java | 16 + modules/jcl/pom.xml | 2 +- modules/jta/pom.xml | 2 +- modules/log4j/pom.xml | 2 +- modules/mesos/README.txt | 28 + modules/mesos/licenses/apache-2.0.txt | 202 ++++++++ modules/mesos/licenses/jetty-epl-license.txt | 69 +++ modules/mesos/pom.xml | 95 ++++ .../apache/ignite/mesos/ClusterProperties.java | 519 +++++++++++++++++++ .../apache/ignite/mesos/IgniteFramework.java | 119 +++++ .../apache/ignite/mesos/IgniteScheduler.java | 361 +++++++++++++ .../org/apache/ignite/mesos/IgniteTask.java | 86 +++ .../org/apache/ignite/mesos/package-info.java | 22 + .../ignite/mesos/resource/IgniteProvider.java | 234 +++++++++ .../ignite/mesos/resource/JettyServer.java | 61 +++ .../ignite/mesos/resource/ResourceHandler.java | 142 +++++ .../ignite/mesos/resource/ResourceProvider.java | 120 +++++ .../ignite/mesos/resource/package-info.java | 22 + .../main/resources/ignite-default-config.xml | 35 ++ .../org/apache/ignite/IgniteMesosTestSuite.java | 38 ++ .../ignite/mesos/IgniteSchedulerSelfTest.java | 464 +++++++++++++++++ modules/rest-http/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/spring/pom.xml | 2 +- modules/ssh/pom.xml | 2 +- modules/tools/pom.xml | 2 +- modules/urideploy/pom.xml | 2 +- .../licenses/jcraft-revised-bsd.txt | 28 - modules/visor-console/pom.xml | 2 +- modules/visor-plugins/pom.xml | 2 +- modules/web/pom.xml | 2 +- modules/yardstick/pom.xml | 2 +- parent/pom.xml | 4 + pom.xml | 15 +- scripts/git-patch-prop.sh | 2 +- 79 files changed, 3294 insertions(+), 233 deletions(-) ----------------------------------------------------------------------
