• Kirill Smelkov's avatar
    Merge branch 'master' into x/gitlab · 99c1f5fc
    Kirill Smelkov authored
    * master: (45 commits)
      add firewalld component
      fixup! NEO: fix build of [slapos-deps-eggs]
      version up : mesa 11.0.3.
      version up eggs.
      python: Add patch to support pytracemalloc and add the corresponding egg to ERP5.
      NEO: do not rely on $HOME, which is not always equal to ${buildout:directory}
      NEO: fix build of [slapos-deps-eggs]
      component python-setuptools updated to version 18.4
      use lockfile egg version 0.10.2 for kvm and webrunner development
      monitor2: fix rss link
      monitor2: add minimal css for the default promise interface
      monitor2: add rss button
      version up: numpy 1.10.0.post2.
      monitor2: add rss feed
      version up : zc.buildout 1.7.1.post13 and zc.recipe.egg 1.3.2.post5.
      version up eggs.
      version up : FreeType 2.6.1.
      version up : pkg-config 0.29
      monitor2: fix status interface js error according to dom
      kvm: cdrom-iso update to version 8.2.0
      ...
    99c1f5fc
slapos.cfg 10.8 KB