Merge remote-tracking branch 'origin/ignite-857' into ignite-857
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/62d15409 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/62d15409 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/62d15409 Branch: refs/heads/ignite-868 Commit: 62d15409cbe2af2f91092c9bd248cb1109218812 Parents: 1c04c8b a36214c Author: nikolay_tikhonov <ntikho...@gridgain.com> Authored: Thu May 28 17:48:06 2015 +0300 Committer: nikolay_tikhonov <ntikho...@gridgain.com> Committed: Thu May 28 17:48:06 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 | 2 +- dev-tools/src/main/groovy/jiraslurp.groovy | 73 ++++-- 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 +- .../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 +- modules/hadoop/pom.xml | 2 +- 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 +- .../apache/ignite/mesos/IgniteScheduler.java | 10 +- .../ignite/mesos/IgniteSchedulerSelfTest.java | 8 +- 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 +- pom.xml | 2 +- 49 files changed, 508 insertions(+), 167 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/62d15409/modules/mesos/src/main/java/org/apache/ignite/mesos/IgniteScheduler.java ---------------------------------------------------------------------- diff --cc modules/mesos/src/main/java/org/apache/ignite/mesos/IgniteScheduler.java index bca064f,9507642..64e2931 --- a/modules/mesos/src/main/java/org/apache/ignite/mesos/IgniteScheduler.java +++ b/modules/mesos/src/main/java/org/apache/ignite/mesos/IgniteScheduler.java @@@ -44,10 -44,10 +44,10 @@@ public class IgniteScheduler implement public static final String DELIM = ","; /** Logger. */ - private static final Logger log = LoggerFactory.getLogger(IgniteScheduler.class); + private static final Logger log = LogManager.getLogger(IgniteScheduler.class); /** Mutex. */ - private static final Object mux = new Object(); + private final Object mux = new Object(); /** ID generator. */ private AtomicInteger taskIdGenerator = new AtomicInteger();
