Merge branch 'sprint-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into sprint-1
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d7f173cc Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d7f173cc Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d7f173cc Branch: refs/heads/master Commit: d7f173cca161c826a0746cdb940ff491df1dccfe Parents: 156e0c1 19c1b5c Author: ivasilinets <ivasilin...@gridgain.com> Authored: Mon Feb 16 15:56:59 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Mon Feb 16 15:56:59 2015 +0300 ---------------------------------------------------------------------- .../org/apache/ignite/compute/ComputeTask.java | 3 +- .../dht/atomic/GridDhtAtomicCache.java | 2 +- .../transactions/IgniteTxLocalAdapter.java | 2 +- .../GridTransactionalCacheQueueImpl.java | 4 +- .../apache/ignite/resources/package-info.java | 22 +++ .../org/apache/ignite/resources/package.html | 25 --- .../near/GridCacheNearMetricsSelfTest.java | 4 +- ...idCachePartitionedHitsAndMissesSelfTest.java | 177 +++++++++++++++++++ .../IgniteCacheMetricsSelfTestSuite.java | 21 +-- ...idCachePartitionedHitsAndMissesSelfTest.java | 176 ------------------ .../IgniteH2IndexingSpiTestSuite.java | 2 - .../commands/cache/VisorCacheCommand.scala | 2 +- .../commands/top/VisorTopologyCommand.scala | 3 +- .../scala/org/apache/ignite/visor/visor.scala | 2 +- pom.xml | 11 +- 15 files changed, 222 insertions(+), 234 deletions(-) ----------------------------------------------------------------------
