diff --git a/CHANGES.txt b/CHANGES.txt index 8e994343fd..6764096caa 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 2.2 + * faster async logback configuration for tests (CASSANDRA-9376) * Add `smallint` and `tinyint` data types (CASSANDRA-8951) * Avoid thrift schema creation when native driver is used in stress tool (CASSANDRA-9374) * Populate TokenMetadata early during startup (CASSANDRA-9317) diff --git a/build.xml b/build.xml index f613478b28..a7c4e98d27 100644 --- a/build.xml +++ b/build.xml @@ -338,8 +338,8 @@ - - + + @@ -1192,8 +1192,8 @@ - - + + diff --git a/lib/logback-classic-1.1.2.jar b/lib/logback-classic-1.1.2.jar deleted file mode 100644 index 9230b2a737..0000000000 Binary files a/lib/logback-classic-1.1.2.jar and /dev/null differ diff --git a/lib/logback-classic-1.1.3.jar b/lib/logback-classic-1.1.3.jar new file mode 100644 index 0000000000..2aa10a5196 Binary files /dev/null and b/lib/logback-classic-1.1.3.jar differ diff --git a/lib/logback-core-1.1.2.jar b/lib/logback-core-1.1.2.jar deleted file mode 100644 index 391da641f0..0000000000 Binary files a/lib/logback-core-1.1.2.jar and /dev/null differ diff --git a/lib/logback-core-1.1.3.jar b/lib/logback-core-1.1.3.jar new file mode 100644 index 0000000000..996b722d05 Binary files /dev/null and b/lib/logback-core-1.1.3.jar differ diff --git a/test/conf/logback-test.xml b/test/conf/logback-test.xml index faffac43d0..8d99aa206f 100644 --- a/test/conf/logback-test.xml +++ b/test/conf/logback-test.xml @@ -17,7 +17,9 @@ under the License. --> - + + + ./build/test/logs/system.log @@ -31,9 +33,17 @@ %-5level [%thread] %date{ISO8601} %msg%n + false + + 0 + 0 + 1024 + + + %-5level %date{HH:mm:ss,SSS} %msg%n @@ -53,7 +63,7 @@ - +