From ddeea293c47a43f19fb03c95088b28855b4b889f Mon Sep 17 00:00:00 2001
From: Thibault Charbonnier <thibaultcha@me.com>
Date: Mon, 3 Apr 2017 14:54:26 -0700
Subject: [PATCH] chore(deps) bump lua-cassandra to 1.2.1

This ensures we update the Nginx time between schema consensus timeout
checks and also adds the ability to manually add and remove C* peers.

https://github.com/thibaultcha/lua-cassandra/compare/1.1.1...1.2.1
---
 kong-0.10.1-0.rockspec    | 2 +-
 kong/dao/db/cassandra.lua | 2 +-
 kong/dao/factory.lua      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/kong-0.10.1-0.rockspec b/kong-0.10.1-0.rockspec
index ce9218e0263..fbd27cabbe4 100644
--- a/kong-0.10.1-0.rockspec
+++ b/kong-0.10.1-0.rockspec
@@ -20,7 +20,7 @@ dependencies = {
   "multipart == 0.5",
   "version == 0.2",
   "lapis == 1.5.1",
-  "lua-cassandra == 1.1.1",
+  "lua-cassandra == 1.2.1",
   "pgmoon-mashape == 2.0.1",
   "luatz == 0.3",
   "lua_system_constants == 0.1.1",
diff --git a/kong/dao/db/cassandra.lua b/kong/dao/db/cassandra.lua
index 2d4c0007cd6..b3c8fcead8c 100644
--- a/kong/dao/db/cassandra.lua
+++ b/kong/dao/db/cassandra.lua
@@ -397,7 +397,7 @@ function _M:find_all(table_name, tbl, schema)
     -- before performing such a DML query
     local ok, err = self:wait_for_schema_consensus()
     if not ok then
-      return nil, "could not wait for schema consensus: " .. err
+      return nil, "failed waiting for schema consensus: " .. err
     end
 
     iter = coordinator.page_iterator
diff --git a/kong/dao/factory.lua b/kong/dao/factory.lua
index 35974e8cce6..7cb504ba15f 100644
--- a/kong/dao/factory.lua
+++ b/kong/dao/factory.lua
@@ -306,7 +306,7 @@ function _M:run_migrations(on_migrate, on_success)
       local ok, err = self.db:wait_for_schema_consensus()
       if not ok then
         return ret_error_string(self.db.name, nil,
-                                "could not wait for schema consensus: " .. err)
+                                "failed waiting for schema consensus: " .. err)
       end
     end