Merge remote-tracking branch 'remotes/origin/master' into ignite-2.1.2 # Conflicts: # modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2503f9ec Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2503f9ec Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2503f9ec Branch: refs/heads/ignite-2.1.2-exchange Commit: 2503f9ec2c5ade34faa77e72670061f430da3ddc Parents: 96c37c6 Author: sboikov <[email protected]> Authored: Mon Jun 19 20:24:09 2017 +0300 Committer: sboikov <[email protected]> Committed: Mon Jun 19 20:24:09 2017 +0300 ---------------------------------------------------------------------- .../src/main/java/org/apache/ignite/IgniteSystemProperties.java | 3 --- 1 file changed, 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/2503f9ec/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java b/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java index e1c2b73..085712a 100644 --- a/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java +++ b/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java @@ -617,9 +617,6 @@ public final class IgniteSystemProperties { */ public static final String IGNITE_PDS_SKIP_CRC = "IGNITE_PDS_SKIP_CRC"; - /** */ - public static final String IGNITE_EXCHANGE_HISTORY_SIZE = "IGNITE_EXCHANGE_HISTORY_SIZE"; - /** * WAL rebalance threshold. */
