Commit 58d47594 authored by Tres Seaver's avatar Tres Seaver

Merge branch 'master' into mjpieters-patch-1

parents e65a7906 362bb049
...@@ -58,7 +58,6 @@ Now we can run the buildout and make sure all attempts to dist.plone.org fails:: ...@@ -58,7 +58,6 @@ Now we can run the buildout and make sure all attempts to dist.plone.org fails::
>>> print_(system(buildout), end='') # doctest: +ELLIPSIS >>> print_(system(buildout), end='') # doctest: +ELLIPSIS
Develop: '/sample-buildout/allowdemo' Develop: '/sample-buildout/allowdemo'
Installing eggs... Installing eggs...
Link to http://dist.plone.org ***BLOCKED*** by --allow-hosts
... ...
While: While:
Installing eggs. Installing eggs.
...@@ -90,7 +89,6 @@ Now we can run the buildout and make sure all attempts to dist.plone.org fails:: ...@@ -90,7 +89,6 @@ Now we can run the buildout and make sure all attempts to dist.plone.org fails::
>>> print_(system(buildout), end='') # doctest: +ELLIPSIS >>> print_(system(buildout), end='') # doctest: +ELLIPSIS
Develop: '/sample-buildout/allowdemo' Develop: '/sample-buildout/allowdemo'
Installing eggs... Installing eggs...
Link to http://dist.plone.org ***BLOCKED*** by --allow-hosts
... ...
While: While:
Installing eggs. Installing eggs.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment