slapos-master: freeze version and repositories revision

software/slapos-master/software.cfg

@@ -27,19 +27,19 @@ recipe = slapos.recipe.build:gitclone
 repository = http://git.erp5.org/repos/erp5.git
 branch = erp5-vifib 
 git-executable = ${git:location}/bin/git
-revision = 
+revision = 6a3c34dfc239ee9fbc19efb1ab577c28041acdff
 
 [vifib]
 recipe = slapos.recipe.build:gitclone
 repository = http://git.erp5.org/repos/slapos.core.git
 branch = master
 git-executable = ${git:location}/bin/git
-revision = 
+revision = 5735db72f24e31c27c6ae1876e17494c6403653b
 
 
 [slapos.cookbook-repository]
 branch = slapos-master-cluster
-revision = 
+revision = 20611a856911dc647a495509632bf922a41c3b75
 
 [vifib-fix-products-paths]
 recipe = plone.recipe.command
@@ -100,6 +100,13 @@ python-memcached = 1.47
 facebook-sdk = 0.4.0
 google-api-python-client = 1.2
 jsonschema = 2.4.0
+APacheDEX = 1.6.2
+PyRSS2Gen = 1.1
+cns.recipe.symlink = 0.2.3
+collective.recipe.template = 1.11
+neoppod = 1.3
+plone.intelligenttext = 2.0.2
+pycurl = 7.19.5.1
 
 # stick to Zope 2.12.22 because Zope 2.12.23's
 # ObjectManager.__getitem__ is much slower for a module having lots of

stack/monitor/buildout.cfg

@@ -121,11 +121,7 @@ mode = 0644
 recipe = hexagonit.recipe.download
 url = ${:_profile_base_location_}/webfile-directory/${:filename}
 download-only = true
-<<<<<<< HEAD
-#md5sum = 4fb26753ee669b8ac90ffe33dbd12e8f
-=======
 md5sum = fa8ec5aa5395b1bc6b9c7e898d6c5ec5
->>>>>>> 4b451f3... slapos-master, erp5, monitor: set md5sum
 destination = ${buildout:parts-directory}/monitor-template-status-history-cgi
 filename = status-history.cgi.in
 mode = 0644