Merge branch 'master' into x/gitlab

* master:
  slapos/recipe/redis: Add support for UNIX sockets
  slapos/recipe/redis/promise: Don't create connection pool explicitly
  redis: v↑  (2.8.23)
  ruby: v↑ ruby2.1  (2.1.7)
  component/postgresql: v↑ postgresql92  (9.2.14)
  component/postgresql: Factor out common build stuff to postgresql-common
  software/postgresql: Don't build postgresql twice
  version up: HAProxy 1.5.15

component/haproxy/buildout.cfg

@@ -11,8 +11,8 @@ parts = haproxy
 
 [haproxy]
 recipe = slapos.recipe.cmmi
-url = http://www.haproxy.org/download/1.5/src/haproxy-1.5.14.tar.gz
-md5sum = ad9d7262b96ba85a0f8c6acc6cb9edde
+url = http://www.haproxy.org/download/1.5/src/haproxy-1.5.15.tar.gz
+md5sum = eeaa35744f84c92184cd735ee56dd0a3
 configure-command = true
 # If the system is running on Linux 2.6, we use "linux26" as the TARGET,
 # otherwise use "generic".

software/postgres/software.cfg

@@ -8,7 +8,7 @@ parts =
   slapos-cookbook-develop
   slapos-cookbook
   instance
-  postgresql92
+  postgresql
 
 
 #----------------