jerith

diff --git a/xenserver/forms.py b/xenserver/forms.py
index c962719..16802ae 100644
--- a/xenserver/forms.py
+++ b/xenserver/forms.py
@@ -72,7 +72,9 @@ class ProvisionForm(BaseForm):
 
     ipaddress = forms.CharField(required=False, help_text='Leave blank for automatic selection')
 
-    extra_network_bridges = forms.CharField(required=False, help_text='Bridge device names for extra network devices (whitespace separated)')
+    extra_network_bridges = forms.CharField(required=False, help_text=(

jerith

diff --git a/mc2/controllers/docker/models.py b/mc2/controllers/docker/models.py
index a4bdb36..a4a84e7 100644
--- a/mc2/controllers/docker/models.py
+++ b/mc2/controllers/docker/models.py
@@ -80,6 +80,13 @@ class DockerController(Controller):
             }
         })
 
+        # Some sensible backoff parameters
+        app_data.update({

jerith

vagrant@debiancontrib-jessie:~/mgmt$ ./mgmt run
13:00:48 main.go:65: This is: mgmt, version: 0.0.3-59-g5d45bcd
13:00:48 main.go:66: Main: Start: 1467982848669801638
13:00:48 main.go:131: Main: Seeds: No seeds specified!
13:00:48 etcd.go:370: Etcd: Bootstrapping...
13:00:48 etcd.go:1313: Etcd: Nominated: debiancontrib-jessie=http://127.0.0.1:2380
13:00:48 etcd.go:1328: Etcd: StartServer(newCluster: true): debiancontrib-jessie=http://127.0.0.1:2380
13:00:48 etcd.go:1566: Etcd: StartServer: Initializing connections...
13:00:48 etcd.go:309: Etcd: Connect: Endpoints: []
13:00:48 etcd.go:565: Etcd: CtxError: No endpoints available yet!

jerith

vagrant@debiancontrib-jessie:~/mgmt$ ./mgmt run
10:57:19 main.go:65: This is: mgmt, version: 0.0.3-52-ge942d71-dirty
10:57:19 main.go:66: Main: Start: 1467716239322452148
10:57:19 main.go:131: Main: Seeds: No seeds specified!
10:57:19 etcd.go:370: Etcd: Bootstrapping...
10:57:19 etcd.go:1313: Etcd: Nominated: debiancontrib-jessie=http://127.0.0.1:2380
10:57:19 etcd.go:1328: Etcd: StartServer(newCluster: true): debiancontrib-jessie=http://127.0.0.1:2380
10:57:19 etcd.go:309: Etcd: Connect: Endpoints: []
10:57:19 etcd.go:565: Etcd: CtxError: No endpoints available yet!
10:57:19 etcd.go:1566: Etcd: StartServer: Initializing connections...

jerith

#!/usr/bin/env python

from HTMLParser import HTMLParser
from urlparse import urlparse

import requests

MC2_URL = 'http://mc2.infr.controller.seed-stack.local'

jerith

diff --git a/.travis.yml b/.travis.yml
index 55daad4..d3d0236 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,5 @@
 language: python
 python:
-  - "2.6"
   - "2.7"
 install:

jerith

diff -r c4d20dd5b286 rpython/rlib/test/test_runicode.py
--- a/rpython/rlib/test/test_runicode.py	Sun Mar 13 07:45:49 2016 +0200
+++ b/rpython/rlib/test/test_runicode.py	Sun Mar 13 18:48:35 2016 +0200
@@ -4,6 +4,8 @@
 import sys, random
 from rpython.rlib import runicode

+from hypothesis import given, settings, strategies
+

jerith

diff --git a/puppet/puppet-bootstrap.sh b/puppet/puppet-bootstrap.sh
index c6d896c..4b1fbbe 100755
--- a/puppet/puppet-bootstrap.sh
+++ b/puppet/puppet-bootstrap.sh
@@ -35,7 +35,9 @@ fi
 
 # If we're using Puppet 4.x, symlink it into /usr/sbin because sudo and $PATH.
 if [ -x /opt/puppetlabs/bin/puppet -a ! -e /usr/sbin/puppet ]; then
-   ln -s /opt/puppetlabs/bin/puppet /usr/sbin/puppet
+    ln -s /opt/puppetlabs/bin/puppet /usr/sbin/puppet

jerith

diff --git a/puppet/Gemfile b/puppet/Gemfile
index c0f5d47..dcbc199 100644
--- a/puppet/Gemfile
+++ b/puppet/Gemfile
@@ -7,7 +7,7 @@ gem 'librarian-puppet'
 gem 'inifile'  # Required by camptocamp-openssl module after the first run.
 
 group :test do
-  gem 'rake'
+  gem 'rake', '<11.0.0'  # See https://github.com/invadersmustdie/puppet-catalog-test/pull/29

jerith

diff --git a/puppet/Gemfile b/puppet/Gemfile
index fb1ac9a..c0f5d47 100644
--- a/puppet/Gemfile
+++ b/puppet/Gemfile
@@ -4,6 +4,7 @@
 source 'https://rubygems.org'
 
 gem 'librarian-puppet'
+gem 'inifile'  # Required by camptocamp-openssl module after the first run.