diff --git a/.gitignore b/.gitignore index 3b01673f09..18f2204efd 100644 --- a/.gitignore +++ b/.gitignore @@ -66,7 +66,7 @@ target/ .DS_Store Thumbs.db -/.ant-targets-build.xml +**/.ant-targets-build.xml .ant_targets # Generated files from the documentation diff --git a/CHANGES.txt b/CHANGES.txt index 66aae18f37..bf0de22b06 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 4.1 + * Add support for PEM based key material for SSL (CASSANDRA-17031) * Standardize storage configuration parameters' names. Support unit suffixes. (CASSANDRA-15234) * Remove support for Windows (CASSANDRA-16956) * Runtime-configurable YAML option to prohibit USE statements (CASSANDRA-17318) diff --git a/examples/ssl-factory/build.xml b/examples/ssl-factory/build.xml index 9f150b03d6..d803aebd0d 100644 --- a/examples/ssl-factory/build.xml +++ b/examples/ssl-factory/build.xml @@ -1,4 +1,4 @@ - +