Merge branch 'ignite-sprint-5' of
https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-218
Conflicts:
modules/core/src/main/java/org/apache/ignite/igfs/IgfsUserContext.java
modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsUtils.java
modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryServerEndpoint.java
modules/hadoop/src/main/java/org/apache/ignite/hadoop/fs/IgniteHadoopIgfsSecondaryFileSystem.java
modules/hadoop/src/main/java/org/apache/ignite/hadoop/fs/v1/IgniteHadoopFileSystem.java
modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/SecondaryFileSystemProvider.java
modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/fs/HadoopLazyConcurrentMap.java
modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/HadoopV2TaskContext.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1b7ceada
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1b7ceada
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1b7ceada
Branch: refs/heads/ignite-218
Commit: 1b7ceadafc971b9d1aca036fc3ce1e541d478aa7
Parents: 25392af 8455c7a
Author: iveselovskiy <[email protected]>
Authored: Fri May 29 16:05:50 2015 +0300
Committer: iveselovskiy <[email protected]>
Committed: Fri May 29 16:05:50 2015 +0300
----------------------------------------------------------------------
dev-tools/src/main/groovy/jiraslurp.groovy | 3 +
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 +-
.../org/apache/ignite/igfs/IgfsUserContext.java | 24 +-
.../igfs/secondary/IgfsSecondaryFileSystem.java | 7 +
.../apache/ignite/internal/IgniteKernal.java | 4 +-
.../internal/processors/igfs/IgfsImpl.java | 8 +-
.../igfs/IgfsSecondaryFileSystemImpl.java | 5 +
.../internal/processors/igfs/IgfsUtils.java | 4 +
.../shmem/IpcSharedMemoryServerEndpoint.java | 2 +-
.../org/apache/ignite/services/Service.java | 5 +-
.../core/src/main/resources/ignite.properties | 2 +-
.../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 +-
modules/hadoop/pom.xml | 2 +-
.../fs/IgniteHadoopIgfsSecondaryFileSystem.java | 45 +-
.../hadoop/fs/v1/IgniteHadoopFileSystem.java | 1 +
.../hadoop/SecondaryFileSystemProvider.java | 52 +-
.../hadoop/fs/HadoopLazyConcurrentMap.java | 146 +++---
.../hadoop/v2/HadoopV2TaskContext.java | 2 +
.../HadoopIgfs20FileSystemAbstractSelfTest.java | 56 +-
.../IgniteHadoopFileSystemAbstractSelfTest.java | 63 ++-
.../collections/HadoopSkipListSelfTest.java | 4 +-
modules/hibernate/pom.xml | 2 +-
modules/indexing/pom.xml | 2 +-
.../query/h2/sql/GridSqlQuerySplitter.java | 4 +
.../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 | 101 ++++
.../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 +-
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 | 3 +-
scripts/git-patch-prop.sh | 2 +-
74 files changed, 3189 insertions(+), 216 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1b7ceada/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsUtils.java
----------------------------------------------------------------------
diff --cc
modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsUtils.java
index ca982d1,8026a44..71a1dbe
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsUtils.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsUtils.java
@@@ -92,7 -92,7 +92,11 @@@ public class IgfsUtils
}
/**
++<<<<<<< HEAD
+ * Provides non-null interned user name.
++=======
+ * Provides non-null user name.
++>>>>>>> 8455c7a6ed6f7449c7ad31b1ef7b129705262e1b
* If the user name is null or empty string, defaults to {@link
FileSystemConfiguration#DFLT_USER_NAME},
* which is the current process owner user.
* @param user a user name to be fixed.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1b7ceada/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/fs/HadoopLazyConcurrentMap.java
----------------------------------------------------------------------
diff --cc
modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/fs/HadoopLazyConcurrentMap.java
index cdafdde,71b38c4..f1c10b6
---
a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/fs/HadoopLazyConcurrentMap.java
+++
b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/fs/HadoopLazyConcurrentMap.java
@@@ -18,13 -18,13 +18,14 @@@
package org.apache.ignite.internal.processors.hadoop.fs;
import org.apache.ignite.*;
- import org.apache.ignite.internal.*;
- import org.apache.ignite.internal.util.typedef.internal.*;
- import org.jetbrains.annotations.*;
-import org.apache.ignite.internal.util.future.*;
import org.jsr166.*;
-import java.io.*;
import java.util.*;
import java.util.concurrent.*;
++import org.apache.ignite.internal.util.future.*;
++
++import java.io.*;
+ import java.util.concurrent.locks.*;
/**
* Maps values by keys.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1b7ceada/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/HadoopV2TaskContext.java
----------------------------------------------------------------------
