Update slapos and erp5.util eggs

slapos/recipe/erp5testnode/template/erp5testnode.cfg.in

@@ -21,9 +21,7 @@ server_url = %(server_url)s
 
 # Binaries
 git_binary = %(git_binary)s
-slapgrid_partition_binary = %(slapgrid_partition_binary)s
-slapgrid_software_binary = %(slapgrid_software_binary)s
-slapproxy_binary = %(slapproxy_binary)s
+slapos_binary = %(slapos_binary)s
 zip_binary = %(zip_binary)s
 
 [environment]

software/erp5testnode/instance-default.cfg

@@ -41,9 +41,7 @@ test-suite-master-url = $${slap-parameter:test-suite-master-url}
 instance-dict = $${slap-parameter:instance-dict}
 software-path-list = $${slap-parameter:software-path-list}
 git-binary = ${git:location}/bin/git
-slapgrid-partition-binary = ${buildout:bin-directory}/slapgrid-cp
-slapgrid-software-binary = ${buildout:bin-directory}/slapgrid-sr
-slapproxy-binary = ${buildout:bin-directory}/slapproxy
+slapos-binary = ${buildout:bin-directory}/slapos
 testnode = ${buildout:bin-directory}/testnode
 zip-binary = ${zip:location}/bin/zip
 httpd-pid-file = $${basedirectory:run}/httpd.pid

software/erp5testnode/software.cfg

@@ -193,7 +193,7 @@ buildout-versions = 1.7
 cffi = 0.8.2
 cmd2 = 0.6.7
 cryptography = 0.4
-erp5.util = 0.4.38
+erp5.util = 0.4.39
 inotifyx = 0.2.0-1
 itsdangerous = 0.24
 lxml = 3.3.5
@@ -206,7 +206,7 @@ pyOpenSSL = 0.14
 pyparsing = 2.0.2
 pytz = 2014.2
 six = 1.7.3
-slapos.core = 1.0.5
+slapos.core = 1.1.2
 slapos.libnetworkcache = 0.14.1
 slapos.recipe.build = 0.12
 slapos.recipe.cmmi = 0.2