ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agoncha...@apache.org
Subject [34/34] ignite git commit: IGNITE-3477 - Merge remote branch
Date Thu, 30 Mar 2017 17:25:44 GMT
IGNITE-3477 - Merge remote branch


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

Branch: refs/heads/ignite-3477-master
Commit: 7b0eb418145eca9b50c8d3a1f4756aa0769c40a8
Parents: 2c480b4 2859bd0
Author: Alexey Goncharuk <alexey.goncharuk@gmail.com>
Authored: Thu Mar 30 20:24:55 2017 +0300
Committer: Alexey Goncharuk <alexey.goncharuk@gmail.com>
Committed: Thu Mar 30 20:24:55 2017 +0300

----------------------------------------------------------------------
 .../internal/processors/cache/GridCacheAdapter.java |  6 +++++-
 .../cache/CacheConfigurationLeakTest.java           |  1 +
 .../cache/MemoryPolicyConfigValidationTest.java     |  2 +-
 .../marshaller/MarshallerContextSelfTest.java       | 10 +++++++++-
 .../cache/IgniteCacheInsertSqlQuerySelfTest.java    |  4 ++++
 .../cache/IgniteCacheMergeSqlQuerySelfTest.java     |  4 ++++
 .../cache/IncorrectCacheTypeMetadataTest.java       |  8 ++++++--
 .../processors/cache/IncorrectQueryEntityTest.java  |  8 ++++++--
 scripts/git-remoteless-branches.sh                  | 16 ++++++++++++++++
 9 files changed, 52 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/7b0eb418/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/7b0eb418/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/MemoryPolicyConfigValidationTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/MemoryPolicyConfigValidationTest.java
index 6b93936,c0f74d0..363c284
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/MemoryPolicyConfigValidationTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/MemoryPolicyConfigValidationTest.java
@@@ -226,7 -226,7 +226,7 @@@ public class MemoryPolicyConfigValidati
          NULL_NAME_ON_USER_DEFINED_POLICY("User-defined MemoryPolicyConfiguration must have
non-null and non-empty name."),
  
          /** */
-         MISSING_USER_DEFINED_DEFAULT("User-defined default MemoryPolicy name is not presented
among configured MemoryPolicies: ");
 -        MISSING_USER_DEFINED_DEFAULT("User-defined default MemoryPolicy name must be presented
among configured MemoryPolices: ");
++        MISSING_USER_DEFINED_DEFAULT("User-defined default MemoryPolicy name is not presented
among configured MemoryPolices: ");
  
          /**
           * @param violationMsg Violation message.

http://git-wip-us.apache.org/repos/asf/ignite/blob/7b0eb418/modules/core/src/test/java/org/apache/ignite/marshaller/MarshallerContextSelfTest.java
----------------------------------------------------------------------


Mime
View raw message