Fix compile error and update changelog.

olim7t · olim7t · commit 7c130dafd6a2 · 2016-05-11T16:30:09.000-07:00
diff --git a/changelog/README.md b/changelog/README.md
@@ -6,6 +6,7 @@ Merged from 2.1 branch:
 
 - [bug] JAVA-1179: Request objects should be copied when executed.
 - [improvement] JAVA-1182: Throw error when synchronous call made on I/O thread.
+- [bug] JAVA-1184: Unwrap StatementWrappers when extracting column definitions.
 
 
 ### 3.0.1
@@ -323,6 +324,7 @@ Merged from 2.0 branch:
 
 - [bug] JAVA-1179: Request objects should be copied when executed.
 - [improvement] JAVA-1182: Throw error when synchronous call made on I/O thread.
+- [bug] JAVA-1184: Unwrap StatementWrappers when extracting column definitions.
 
 
 ### 2.1.10.1
diff --git a/driver-core/src/test/java/com/datastax/driver/core/QueryLoggerTest.java b/driver-core/src/test/java/com/datastax/driver/core/QueryLoggerTest.java
@@ -1037,12 +1037,12 @@ public void should_log_all_parameters_when_max_unlimited_simple_statements_with_
                 .contains("42");
     }
 
-    @CassandraVersion(major=2.0)
+    @CassandraVersion(major = 2.0)
     @Test(groups = "short")
     public void should_log_wrapped_bound_statement() throws Exception {
         // given
         normal.setLevel(TRACE);
-        queryLogger = QueryLogger.builder(cluster())
+        queryLogger = QueryLogger.builder()
                 .withConstantThreshold(Long.MAX_VALUE)
                 .withMaxQueryStringLength(Integer.MAX_VALUE)
                 .build();
