You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ds...@apache.org on 2015/09/30 14:19:32 UTC
[1/2] ignite git commit: # master - changed "ssl" to "tls/ssl"
Repository: ignite
Updated Branches:
refs/heads/master 1282f8b1d -> de39fbf26
# master - changed "ssl" to "tls/ssl"
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f3808831
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f3808831
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f3808831
Branch: refs/heads/master
Commit: f3808831a8df1b67b81a92f50cd2b23c3358e604
Parents: c6ec7e1
Author: Dmitiry Setrakyan <ds...@gridgain.com>
Authored: Wed Sep 30 14:19:13 2015 +0200
Committer: Dmitiry Setrakyan <ds...@gridgain.com>
Committed: Wed Sep 30 14:19:13 2015 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/ignite/internal/IgniteKernal.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/f3808831/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index 68a0383..c02dc59 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -2177,7 +2177,7 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
assert log != null;
U.quietAndInfo(log, "Security status [authentication=" + onOff(ctx.security().enabled())
- + ", ssl=" + onOff(ctx.config().getSslContextFactory() != null) + ']');
+ + ", tls/ssl=" + onOff(ctx.config().getSslContextFactory() != null) + ']');
}
/**
[2/2] ignite git commit: Merge remote-tracking branch 'origin/master'
Posted by ds...@apache.org.
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/de39fbf2
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/de39fbf2
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/de39fbf2
Branch: refs/heads/master
Commit: de39fbf269ad6f834ab01444558ea2dced1c2035
Parents: f380883 1282f8b
Author: Dmitiry Setrakyan <ds...@gridgain.com>
Authored: Wed Sep 30 14:19:28 2015 +0200
Committer: Dmitiry Setrakyan <ds...@gridgain.com>
Committed: Wed Sep 30 14:19:28 2015 +0200
----------------------------------------------------------------------
.../discovery/GridDiscoveryManager.java | 22 +--
.../processors/cache/GridCacheEventManager.java | 12 +-
.../processors/cache/GridCacheIoManager.java | 76 +--------
.../processors/cache/GridCacheMessage.java | 7 -
.../processors/cache/GridCacheProcessor.java | 68 +++++---
.../cache/GridCacheSharedContext.java | 32 ----
.../processors/cache/GridCacheUtils.java | 8 -
.../dht/GridDhtAffinityAssignmentRequest.java | 5 -
.../dht/GridDhtAffinityAssignmentResponse.java | 5 -
.../distributed/dht/GridDhtLockRequest.java | 5 -
.../distributed/dht/GridDhtTxFinishRequest.java | 5 -
.../dht/GridDhtTxPrepareRequest.java | 7 +-
.../dht/preloader/GridDhtForceKeysRequest.java | 5 -
.../dht/preloader/GridDhtForceKeysResponse.java | 5 -
.../GridDhtPartitionDemandMessage.java | 5 -
.../GridDhtPartitionSupplyMessage.java | 5 -
.../GridDhtPartitionsAbstractMessage.java | 5 -
.../dht/preloader/GridDhtPreloader.java | 6 +
.../IgniteClientReconnectAbstractTest.java | 35 ++++-
.../IgniteClientReconnectCacheTest.java | 154 +++++++++++++++++++
.../IgniteCacheP2pUnmarshallingErrorTest.java | 7 +
...CacheP2pUnmarshallingRebalanceErrorTest.java | 12 +-
22 files changed, 266 insertions(+), 225 deletions(-)
----------------------------------------------------------------------