Merge branch 'chore/fix-travis-ccm' into next

.ci/setup_env.sh

@@ -94,11 +94,7 @@ eval `luarocks path`
 # Install ccm & setup Cassandra cluster
 # -------------------------------------
 if [[ "$TEST_SUITE" != "unit" ]] && [[ "$TEST_SUITE" != "lint" ]]; then
-  pip install --user PyYAML six
-  git clone https://github.com/pcmanus/ccm.git
-  pushd ccm
-    ./setup.py install --user
-  popd
+  pip install --user PyYAML six ccm==2.4.6
   ccm create test -v binary:$CASSANDRA -n 1 -d
   ccm start -v
   ccm status

.travis.yml

@@ -57,4 +57,4 @@ cache:
   directories:
     - $DOWNLOAD_CACHE
     - $INSTALL_CACHE
-    - $HOME/.ccm/repository
+    - $HOME/.ccm/repository

CHANGELOG.md

@@ -6,6 +6,12 @@
 
 - Resolve support for PostgreSQL SSL connections.
   [#1720](https://github.com/Mashape/kong/issues/1720)
+- Ensure `kong start` honors the `--conf` flag is a config file already exists
+  at one of the default locations (`/etc/kong.conf`, `/etc/kong/kong.conf`).
+  [#1681](https://github.com/Mashape/kong/pull/1681)
+- Obfuscate sensitive properties from the `/` Admin API route which returns
+  the current node's configuration.
+  [#1650](https://github.com/Mashape/kong/pull/1650)
 
 ## [0.9.5] - 2016/11/07
 

spec/01-unit/02-conf_loader_spec.lua

@@ -395,6 +395,17 @@ describe("Configuration loader", function()
       assert.is_nil(conf)
       assert.equal("must specify 'cassandra_local_datacenter' when DCAwareRoundRobin policy is in use", err)
     end)
+    it("honors path if provided even if a default file exists", function()
+      conf_loader.add_default_path("spec/fixtures/to-strip.conf")
+
+      finally(function()
+        package.loaded["kong.conf_loader"] = nil
+        conf_loader = require "kong.conf_loader"
+      end)
+
+      local conf = assert(conf_loader(helpers.test_conf_path))
+      assert.equal("postgres", conf.database)
+    end)
   end)
 
   describe("errors", function()