Merge remote-tracking branch 'remotes/origin/master' into ignite-901
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/55bd754f Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/55bd754f Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/55bd754f Branch: refs/heads/ignite-901 Commit: 55bd754f1a790abd95423daf5579f2cee3c34811 Parents: 29c7fa7 b8a4b5a Author: sboikov <sboi...@gridgain.com> Authored: Tue Jul 7 09:30:33 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Tue Jul 7 09:30:33 2015 +0300 ---------------------------------------------------------------------- modules/core/pom.xml | 4 +- .../internal/interop/InteropIgnition.java | 31 +++++--- .../ignite/internal/util/IgniteUtils.java | 6 +- ...acheAtomicReplicatedNodeRestartSelfTest.java | 10 +++ .../TcpDiscoveryNodeConsistentIdSelfTest.java | 80 ++++++++++++++++++++ .../IgniteSpiDiscoverySelfTestSuite.java | 2 + modules/mesos/pom.xml | 1 - modules/rest-http/pom.xml | 14 ++-- modules/urideploy/pom.xml | 8 +- modules/web/pom.xml | 6 +- parent/pom.xml | 1 + 11 files changed, 134 insertions(+), 29 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/55bd754f/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java ----------------------------------------------------------------------
