Skip to content
Permalink
Branch: master
Commits on Jun 22, 2015
  1. link to experimental

    lukemarsden
    lukemarsden committed Jun 22, 2015
  2. tweaks to readme to reference the tweaked versions

    lukemarsden
    lukemarsden committed Jun 22, 2015
  3. tweaks to the readme

    lukemarsden
    lukemarsden committed Jun 22, 2015
  4. merge in latest boxes

    Luke Marsden
    Luke Marsden committed Jun 22, 2015
  5. A somewhat obvious fix

    errordeveloper committed Jun 22, 2015
  6. bump to box v16

    binocarlos committed Jun 22, 2015
Commits on Jun 21, 2015
  1. setup so we can choose which weave version we can run - new way of ex…

    binocarlos committed Jun 21, 2015
    …posing the proxy using docker service
  2. Revert to dig hack

    errordeveloper committed Jun 21, 2015
  3. Merge branch 'build-box-with-latest-network' of https://github.com/Cl…

    binocarlos committed Jun 21, 2015
    …usterHQ/docker-plugins-demo into build-box-with-latest-network
    
    * 'build-box-with-latest-network' of https://github.com/ClusterHQ/docker-plugins-demo:
      Use DNS this way for the moment
  4. Merge branch 'build-box-with-latest-network' of gh:clusterhq/docker-p…

    errordeveloper committed Jun 21, 2015
    …lugins-demo into build-box-with-latest-network
  5. Make twistd use resolver

    Luke Marsden
    Luke Marsden committed Jun 21, 2015
  6. https

    Luke Marsden
    Luke Marsden committed Jun 21, 2015
  7. Merge branch 'master' of https://github.com/ClusterHQ/docker-plugins-…

    binocarlos committed Jun 21, 2015
    …demo
    
    * 'master' of https://github.com/ClusterHQ/docker-plugins-demo:
      remove deps
      simplify
      tweaks - remove deps, switch to --publish-service (in anticipation)
  8. remove deps

    lukemarsden
    lukemarsden committed Jun 21, 2015
  9. simplify

    lukemarsden
    lukemarsden committed Jun 21, 2015
  10. point to the v12 box

    binocarlos committed Jun 21, 2015
  11. Merge remote-tracking branch 'origin/master' into baked-certs

    binocarlos committed Jun 21, 2015
    * origin/master:
      add scope
      the critical part of the demo
Commits on Jun 20, 2015
  1. add scope

    lukemarsden
    lukemarsden committed Jun 20, 2015
  2. the critical part of the demo

    lukemarsden
    lukemarsden committed Jun 20, 2015
  3. Merge branch 'master' into add-scope

    Luke Marsden
    Luke Marsden committed Jun 20, 2015
Older
You can’t perform that action at this time.