Merge branches 'ignite-368' and 'sprint-2' of
https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-368
Conflicts:
modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJob.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/78fbe306
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/78fbe306
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/78fbe306
Branch: refs/heads/ignite-sql-tests
Commit: 78fbe306530b37614f112b40f3fae5db9114bb98
Parents: 7ed41cf
Author: AKuznetsov <[email protected]>
Authored: Mon Mar 16 20:28:50 2015 +0700
Committer: AKuznetsov <[email protected]>
Committed: Mon Mar 16 20:28:50 2015 +0700
----------------------------------------------------------------------
.../ignite/internal/visor/node/VisorNodeDataCollectorJob.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78fbe306/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJob.java
----------------------------------------------------------------------
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJob.java
b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJob.java
index 9366099..f3f264f 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJob.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJob.java
@@ -18,8 +18,8 @@
package org.apache.ignite.internal.visor.node;
import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
+import org.apache.ignite.internal.processors.cache.*;
import org.apache.ignite.internal.processors.igfs.*;
import org.apache.ignite.internal.util.ipc.*;
import org.apache.ignite.internal.util.typedef.internal.*;
