summaryrefslogtreecommitdiff
path: root/kitchen-tests
diff options
context:
space:
mode:
authortyler-ball <tyleraball@gmail.com>2014-09-30 11:44:33 -0700
committertyler-ball <tyleraball@gmail.com>2014-10-07 16:41:47 -0700
commit2088c43f4366621ef505a4b6207819913a70855f (patch)
treec4297762cf154a5fda6a7113792e914deb7892ba /kitchen-tests
parentf9b74b1bf1726dffa2674a363f06c4fb962bdb53 (diff)
downloadchef-2088c43f4366621ef505a4b6207819913a70855f.tar.gz
Removing my branch from test kitchen - preparing to merge to master
Diffstat (limited to 'kitchen-tests')
-rw-r--r--kitchen-tests/.kitchen.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/kitchen-tests/.kitchen.yml b/kitchen-tests/.kitchen.yml
index d13a558c97..651a606502 100644
--- a/kitchen-tests/.kitchen.yml
+++ b/kitchen-tests/.kitchen.yml
@@ -2,7 +2,7 @@
provisioner:
name: chef_solo
github: "opscode/chef"
- branch: "tball/yajl-replace-json" # TODO replace this when going to master
+ branch: <%= %x(git rev-parse HEAD) %>
require_chef_omnibus: true
data_path: test/fixtures