From 8cb00a97ec481aa652d94fcc9e3d61f4215a6298 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Tue, 7 Jun 2016 16:16:16 +0200
Subject: [PATCH] Fix knapsack for master

---
 .gitlab-ci.yml | 2 +-
 CHANGELOG      | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fc1e43fcd4..5ef3081395 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -144,7 +144,7 @@ spinach 9 10: *spinach-knapsack
   <<: *ruby-22
 
 .spinach-knapsack-ruby22: &spinach-knapsack-ruby22
-  <<: *rspec-knapsack
+  <<: *spinach-knapsack
   <<: *ruby-22
   
 rspec 0 20 ruby22: *rspec-knapsack-ruby22
diff --git a/CHANGELOG b/CHANGELOG
index 7809fef170..2067017f25 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -16,6 +16,7 @@ v 8.9.0 (unreleased)
   - Fix groups API to list only user's accessible projects
   - Redesign account and email confirmation emails
   - Use gitlab-shell v3.0.0
+  - Use Knapsack to evenly distribute tests across multiple nodes
   - Add `sha` parameter to MR merge API, to ensure only reviewed changes are merged
   - Don't allow MRs to be merged when commits were added since the last review / page load
   - Add DB index on users.state