switch chris lea redis-server ppa to ha.pool keyserver

Lyoness · Lyoness · commit 46f5a741d373 · 2017-04-10T17:38:26.000-04:00
diff --git a/ci_environment/redis/recipes/default.rb b/ci_environment/redis/recipes/default.rb
@@ -25,7 +25,11 @@
   uri          "http://ppa.launchpad.net/chris-lea/redis-server/ubuntu"
   distribution node['lsb']['codename']
   components   ["main"]
+<<<<<<< HEAD
   key          "136221EE520DDFAF0A905689B9316A7BC7917B12"
+=======
+  key          "0xC7917B12"
+>>>>>>> switch chris lea redis-server ppa to ha.pool keyserver
   keyserver    "hkp://ha.pool.sks-keyservers.net"
 
   action :add
