ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-5075' into ignite-5075-pds
Date Wed, 24 May 2017 18:05:58 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-5075-pds ebfbd994f -> d1e3f8c70


Merge remote-tracking branch 'remotes/origin/ignite-5075' into ignite-5075-pds

# Conflicts:
#	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/IgniteCacheDatabaseSharedManager.java
#	modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryIndexing.java
#	modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
#	modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d1e3f8c7
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d1e3f8c7
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d1e3f8c7

Branch: refs/heads/ignite-5075-pds
Commit: d1e3f8c704cf326da5b4008db738315ffbab69bb
Parents: ebfbd99
Author: sboikov <sboikov@gridgain.com>
Authored: Wed May 24 21:05:50 2017 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Wed May 24 21:05:50 2017 +0300

----------------------------------------------------------------------
 .../ignite/internal/processors/query/GridQueryProcessor.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/d1e3f8c7/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
index fb70a1c..38f9101 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
@@ -1471,7 +1471,7 @@ public class GridQueryProcessor extends GridProcessorAdapter {
                     fut.onDone(e);
                 }
                 catch (Throwable e) {
-                    U.error(log, "Failed to rebuild indexes for type [space=" + space +
+                    U.error(log, "Failed to rebuild indexes for type [cache=" + cacheName
+
                         ", name=" + desc.name() + ']', e);
 
                     fut.onDone(e);


Mime
View raw message