Merge remote-tracking branch 'core/2.12.0_prep'

Michael Fero · Michael Fero · commit b139bcbdeeeb · 2019-04-19T10:25:35.000-04:00
diff --git a/cpp-driver/build.yaml b/cpp-driver/build.yaml
@@ -19,7 +19,7 @@ os:
   - centos/7-64/cpp
   - osx/high-sierra
 env:
-  LIBUV_VERSION: 1.26.0
+  LIBUV_VERSION: 1.28.0
 build:
   - script: |
       . .build.sh
diff --git a/cpp-driver/src/monitor_reporting.cpp b/cpp-driver/src/monitor_reporting.cpp
@@ -24,4 +24,4 @@ MonitorReporting* create_monitor_reporting(const String& client_id,
   return new NopMonitorReporting();
 }
 
-}; // namespace cass
+} // namespace cass

Original file line number	Diff line number	Diff line change
`@@ -24,4 +24,4 @@ MonitorReporting* create_monitor_reporting(const String& client_id,`
`24`	`24`	`return new NopMonitorReporting();`
`25`	`25`	`}`
`26`	`26`
`27`		`-}; // namespace cass`
	`27`	`+} // namespace cass`