cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jasobr...@apache.org
Subject [1/3] cassandra git commit: Replace keystore for utests with non export restricted cipher keys
Date Mon, 28 Nov 2016 13:21:17 GMT
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.X 68c828f48 -> 554d53664
  refs/heads/trunk 2f8d90766 -> 8fb01dd21


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/554d5366
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/554d5366
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/554d5366

Branch: refs/heads/cassandra-3.X
Commit: 554d53664c87b4611b72e570e99ec008fe00aa32
Parents: 68c828f
Author: Stefan Podkowinski <s.podkowinski@gmail.com>
Authored: Thu Nov 24 09:23:40 2016 +0100
Committer: Jason Brown <jasedbrown@gmail.com>
Committed: Mon Nov 28 05:14:19 2016 -0800

----------------------------------------------------------------------
 CHANGES.txt                                      |   1 +
 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 ++++----
 6 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/554d5366/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 32a3f32..93f9fcc 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 3.12
+ * Resolve unit testing without JCE security libraries installed (CASSANDRA-12945)
  * cqlsh auto completion: refactor definition of compaction strategy options (CASSANDRA-12946)
  * Add support for arithmetic operators (CASSANDRA-11935)
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/554d5366/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/554d5366/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/554d5366/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/554d5366/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/554d5366/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


Mime
View raw message