You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ja...@apache.org on 2016/11/29 19:10:02 UTC
[6/9] cassandra git commit: Replace keystore for utests with non
export restricted cipher keys
Replace keystore for utests with non export restricted cipher keys
patch by Stefan Podkowinski; reviewed by Jason Brown for CASSANDRA-12945
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c4cb915e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c4cb915e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c4cb915e
Branch: refs/heads/trunk
Commit: c4cb915eaf18569266e9e5223c1a3029431b00dc
Parents: f87d074
Author: Stefan Podkowinski <s....@gmail.com>
Authored: Thu Nov 24 09:23:40 2016 +0100
Committer: Jason Brown <ja...@gmail.com>
Committed: Tue Nov 29 11:06:08 2016 -0800
----------------------------------------------------------------------
test/conf/cassandra.keystore | Bin 1004 -> 972 bytes
.../3.4-encrypted/CommitLog-6-1452918948163.log | Bin 872373 -> 0 bytes
.../3.4-encrypted/CommitLog-6-1480001790338.log | Bin 0 -> 1452357 bytes
.../3.4-encrypted/CommitLog-6-1480001790339.log | Bin 0 -> 137 bytes
.../data/legacy-commitlog/3.4-encrypted/hash.txt | 8 ++++----
5 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c4cb915e/test/conf/cassandra.keystore
----------------------------------------------------------------------
diff --git a/test/conf/cassandra.keystore b/test/conf/cassandra.keystore
index 9a704ca..da88524 100644
Binary files a/test/conf/cassandra.keystore and b/test/conf/cassandra.keystore differ
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c4cb915e/test/data/legacy-commitlog/3.4-encrypted/CommitLog-6-1452918948163.log
----------------------------------------------------------------------
diff --git a/test/data/legacy-commitlog/3.4-encrypted/CommitLog-6-1452918948163.log b/test/data/legacy-commitlog/3.4-encrypted/CommitLog-6-1452918948163.log
deleted file mode 100644
index 3be1fcf..0000000
Binary files a/test/data/legacy-commitlog/3.4-encrypted/CommitLog-6-1452918948163.log and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c4cb915e/test/data/legacy-commitlog/3.4-encrypted/CommitLog-6-1480001790338.log
----------------------------------------------------------------------
diff --git a/test/data/legacy-commitlog/3.4-encrypted/CommitLog-6-1480001790338.log b/test/data/legacy-commitlog/3.4-encrypted/CommitLog-6-1480001790338.log
new file mode 100644
index 0000000..2a04c6f
Binary files /dev/null and b/test/data/legacy-commitlog/3.4-encrypted/CommitLog-6-1480001790338.log differ
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c4cb915e/test/data/legacy-commitlog/3.4-encrypted/CommitLog-6-1480001790339.log
----------------------------------------------------------------------
diff --git a/test/data/legacy-commitlog/3.4-encrypted/CommitLog-6-1480001790339.log b/test/data/legacy-commitlog/3.4-encrypted/CommitLog-6-1480001790339.log
new file mode 100644
index 0000000..8606496
Binary files /dev/null and b/test/data/legacy-commitlog/3.4-encrypted/CommitLog-6-1480001790339.log differ
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c4cb915e/test/data/legacy-commitlog/3.4-encrypted/hash.txt
----------------------------------------------------------------------
diff --git a/test/data/legacy-commitlog/3.4-encrypted/hash.txt b/test/data/legacy-commitlog/3.4-encrypted/hash.txt
index d4cca55..36e29ce 100644
--- a/test/data/legacy-commitlog/3.4-encrypted/hash.txt
+++ b/test/data/legacy-commitlog/3.4-encrypted/hash.txt
@@ -1,5 +1,5 @@
#CommitLog upgrade test, version 3.4-SNAPSHOT
-#Fri Jan 15 20:35:53 PST 2016
-cells=8777
-hash=-542543236
-cfid=9debf690-bc0a-11e5-9ac3-9fafc76bc377
+#Thu Nov 24 16:36:34 CET 2016
+cells=14561
+hash=2026350947
+cfid=c5b59a80-b25b-11e6-b205-bb359f887ad3