Merge branch 'master' into feature/transformations-plugin

Makefile

@@ -28,9 +28,9 @@ dev:
 
 clean:
 	@rm -f luacov.*
-	@rm -f $(DEVELOPMENT_CONF) $(TESTING_CONF)
 	@rm -rf nginx_tmp
 	@bin/kong migrations -c $(DEVELOPMENT_CONF) reset
+	@rm -f $(DEVELOPMENT_CONF) $(TESTING_CONF)
 
 run:
 	@bin/kong start -c $(DEVELOPMENT_CONF)
@@ -51,6 +51,7 @@ coverage:
 	@rm -f luacov.*
 	@busted --coverage spec/unit
 	@luacov -c spec/.luacov
+	@tail -n 1 luacov.report.out | awk '{ print $$3 }'
 
 test-api:
 	@busted spec/integration/api

README.md

@@ -4,7 +4,7 @@
 [![Coverage Status][coveralls-badge]][coveralls-url]
 [![Gitter][gitter-badge]][gitter-url]
 
-Kong is a scalable, lightweight open-source Management Layer for APIs and Microservices. Built on top of NGINX with focus on high performance and reliability. 
+Kong is a scalable, open-source Management Layer for APIs and Microservices. Built on top of NGINX with focus on high performance and reliability.
 
 ## Why Kong
 
@@ -48,24 +48,24 @@ $ kong --help
 
 1. Clone the repository and make it your working directory.
 2. Run `[sudo] make install`
-  
+
   This will build and install the `kong` luarock globally.
 
 3. Run `make dev`
-   
+
   This will install development dependencies and create your environment configuration files:
 
   - `kong_TESTS.yml`
   - `kong_DEVELOPMENT.yml`
 
 4. Run the tests:
-  
+
   ```bash
   make test-all
   ```
-  
+
 5. Run Kong with the development configuration file:
-   
+
    ```bash
    $ kong start -c kong_DEVELOPMENT.yml
    ```

kong-0.2.0-1.rockspec

@@ -21,7 +21,7 @@ dependencies = {
   "inspect ~> 3.0-1",
   "stringy ~> 0.4-1",
   "multipart ~> 0.1-2",
-  "cassandra ~> 0.5-5",
+  "cassandra ~> 0.5-6",
   "lua-path ~> 0.2.3-1",
   "lua-cjson ~> 2.1.0-1",
   "luasocket ~> 2.0.2-5",