Squashed 'github.com/crosbymichael/dockerui/' changes from c5c1776..d17adc0

d17adc0 Add missing files
9eaa75a Merge branch 'dev'
007492b Update dockerfile and server
3ac9776 Merge branch 'dashboard' into dev
dea7bfb Add created chart for images and containers
847c2d5 Hide masthead after first load
ef3ec09 Merge branch 'image-stats' into dev
3643525 Change image chart sizes
de18a30 Add containers created
b1228a7 Fix alignment and floats
1a3ace3 Merge branch 'charts' into dev
7ae0b17 Improve messages
0e41aec Add chart to dashboard
cfa8d3a Small bug fixes with new docker versions
0baf3ae Allows to specify the path to the assets
b4e8d0b Add growl files for notifications

git-subtree-dir: github.com/crosbymichael/dockerui
git-subtree-split: d17adc0f9d4d93efc728274b7afec85cf78a8bf4
Merge commit '534e2baaaaf18ef0ac39bdbc430286f36fd05fa4'
Squashed 'github.com/dotcloud/docker-registry/' changes from 0b8c4d5..54d3fb7

54d3fb7 Fixed test/workflow.py
96b4ddf Added s3 creds to test config
cdd8cf4 Fixed S3 functional test
45d72b4 disabling cache config in config test
86d56ef Removed cache by default is config sample
ab2a346 Bumped version to 0.6.0
3a9c15f Added auth to cache
fb58dbc Convert config types
847d2e1 Fixed unused import
8ef0db5 Added dotcloudignore
ca7487a Fixed cache
df9cfdb Fixed unittests
08fbbdc Added redis requirement
1a675eb Redis can be enabled if cache is True
9d2481b Implemented optional caching over Redis
fdf9a5a Add ability to set env var in config value
5a16c13 Update README.md
76e0d51 Fix test-requirements conflicts
932553b Fix test-requirements conflicts
a7b8e92 Merge branch 'master' of github.com:dotcloud/docker-registry
bffa9f3 Added support for flake8 checks with hacking package enabled
90b39cd Update README.md
f9c59e0 Merge branch 'master' of github.com:dotcloud/docker-registry
88e4e17 Fix travis-ci
43d70d3 Update README.md
2afd346 Merge branch 'master' of github.com:dotcloud/docker-registry
7fbafa4 Added support for travis-ci + tox
9e9571a Merge branch 'master' of https://github.com/dotcloud/docker-registry
2d7cd51 Added sample nginx.conf to contrib
d1a86b6 Merge pull request #70 from shin-/master
3a09a16 Fixed simple checksum
debd567 Bumped version to 0.5.9
ec71a2e Avoid calling handlers in socket reader when reached EOF
b19ea93 flake8 pass
76de383 put_image_layer: Parallelized simple checksum/temp storage/layer storage, subsequent tarsum on temp file
7854a33 Fixed glance image allocation
9f183a7 Allow pass a custom glance image id
3cdf60c Typo
4082ae2 Merge branch 'master' of github.com:dotcloud/docker-registry
b41904b Make the image public
9be15a7 Merge pull request #67 from 23critters/master
74b4202 run.sh is a bash script
4ecb2dd Merge pull request #65 from jamescarr/patch-1
c2e3127 Allow for the configuration of number of workers and port via environment variables.
56d843c Added script to run the registry easily
fcf9574 Added support for keystone token fetch in glance module
8a3c5c0 Some more changes to the glance storage module
5504fbf Bumped version to 0.5.8
17191ae Merge branch 'storage-glance'
be613c2 Fixed Dockerfile
5a2664d Generate secret_key randomly in the Dockerfile
307e76d Some syntax formatting
4a03d9c Rebased master
3814660 Update config_sample.yml
5a490d4 Merge pull request #62 from jschneiderhan/allow-gunicorn-cmd-override
4fa83c0 Allow overriding of gunicorn while still preserving env variable injection
13061fc Merge pull request #60 from jamescarr/master
2431207 Cleanup confusing comment
07892e7 Removed unused code
6046cbc Set of bugfixes on the glance storage module, it now works.
b39f8a8 Disabled tarsum debug for better visibility
0248a35 Simplified a "if" in images module
35ff2fa Provide sample config for openstack
6b0798d Added missing requirement
257a341 Re-factored the glance storage dispatcher
fd7fdc9 Fixed typos
a41055f Now supports tagging images names on the layer stored in Glance
e03990a Added support for signals in order to implement hooks in the storage modules
7af152d Fixed image list
7ff8048 OpenStack glance support in Docker Registry
c0fd74a I got the hookup.
baecc41 give them some environment variable options!

git-subtree-dir: github.com/dotcloud/docker-registry
git-subtree-split: 54d3fb71abc812e80485865947e65a63456610b1
Merge commit '32ec4afdf09e58b0489c9ab38842559ba4e372ee'
Squashed 'github.com/dotcloud/docker/' changes from 6da0719..e893968

e893968 Merge pull request #1735 from dotcloud/1301-support-domainname
2801624 Merge pull request #1796 from shin-/api_1_5
58281b4 Merge pull request #1793 from reds/master
dd806b4 add Martin Redmond to AUTHORS
843f909 Merge branch 'filter' of https://github.com/reds/docker into reds-filter
53da050 Merge pull request #1837 from dotcloud/fix-tests-1812
bd847f6 rebase master
e503f6a Merge pull request #1825 from dotcloud/merge-builder-runtime
8ddfb4d Merge pull request #1828 from mmikulicic/patch-1
28f2fe9 Merge pull request #1836 from srid/patch-2
3c90e96 remove docker-ruby from docs
46a1cd6 only os.Exits on error
9b088ad Merge pull request #1812 from dotcloud/return-run-exit-code
0508bd8 Merge pull request #1773 from hectcastro/hc-riak-example
446ca4b fix init layer
4f2e59f bind mount /etc/hosts and /etc/hostname
0a436e0 add domainname support
c66a827 Merge pull request #1807 from tianon/gentoo-docs
49b5c44 Merge pull request #1833 from shin-/1815-always-push-tags
64bc08f Push tags to registry even if images are already uploaded
2d4ac06 Merge pull request #1831 from brianshumate/jbs-docs-edits
9749d94 note about exiting from attachment prior to running
630ae43 improve sentence readabilty
268928a Please add go-dockerclient to docker API clients doc
eca861a Add missing package import
6a9f4ec Add missing comments to runtime.go
24e0204 Merge builder.go into runtime.go
c8f885a Merge pull request #1822 from dotcloud/remove_os_user
b07314e Remove import os/user
eed00a4 README: remove original shipping containers 'manifesto'. It's a little long to stay here.
6679f3b README: replace 'install instructions' and 'usage examples' with references to the website and docs
70ab25a README: harmonize intro with website
bcb8d3f README: refer to the docs for install instructions to remove duplication.
b9ca311 Update roadmap
37186d9 Merge pull request #1818 from metalivedev/655-searchswiftype
03a28da Add Swiftype search to docs
b44d113 filter image listing using path.Match
35bcba8 improve image listing
f2bc7eb Merge pull request #1777 from dotcloud/1620-index-test
8a2fd91 Merge pull request #1780 from shin-/1218-push-dependencies
f3d51bb Merge pull request #1810 from dotcloud/1798-inspect-fix
d06a0ba Merge pull request #1811 from dotcloud/672-remove_getcache
8374dac From FIXME: local path for ADD
3bc73fa Return the process exit code for run commands
0d70449 remove unused getCache endpoint
20a763e fix indent in doc
5ec2fea Detect images/containers conflicts in docker inspect
908bb65 Merge pull request #1803 from dotcloud/1802-skip-TestGetContainersTop
d368c2d Update Gentoo docs to reflect the package name change from app-emulation/lxc-docker to app-emulation/docker as discussed in today's #docker-meeting
82dd417 Reformat Gentoo install instructions to 80 columns
b57d7dc Merge pull request #1804 from Bouke/patch-1
8e41181 Merge pull request #1772 from dotcloud/update-tar-revision
fdf1fcc Fix memory recommendations (Byte, not bit)
bf6e241 testing, issue #1802: Temporarily skip TestGetContainersTop
f0cdbaa Merge pull request #1801 from vcoisne/master
e0d6bae Merge pull request #1789 from tommyblue/patch-1
d6ff912 Merge pull request #1797 from denibertovic/docs
ad04cac Add step to docker installation using vagrant (Mac, Linux)
62823cf fixed docs for installing binary
9ae5054 Bumped API version in api.go ; added <1.5 behavior to getContainersJSON
8878943 deployment, issue #1578: Avoid pinning kernel headers. Add Vagrantfile assumptions
8e3844c Merge pull request #1578 from jimmycuadra/vagrant-provider-detection
1a32c4a Merge pull request #1795 from eliasp/patch-1
98edd0e Updated docs for API v1.5
98a1314 Merge branch 'mhennings-1357-implement-login-with-private-registry' into api_1_5
34edbd4 Merge branch '1357-implement-login-with-private-registry' of git://github.com/mhennings/docker into mhennings-1357-implement-login-with-private-registry
2ea52dd Merge branch 'better_api_ports' of git://github.com/shin-/docker into shin--better_api_ports
396274f Typo
28e75b2 Don't install VirtualBox Guest Additions if VAGRANT_DEFAULT_PROVIDER is set.
ad5796d Adds instruction about UDP port redirection
3a6868b Merge pull request #1788 from dotcloud/1787-deprecate-port-forwarding
34145f9 deployment, issue #1787: Remove deprecated port forwarding from /Vagrantfile
58ea690 Merge pull request #1784 from proger/patch-1
3b92ab3 Merge pull request #1783 from briehanlombaard/typos
76f97a6 Merge pull request #1785 from thijsterlouw/update_commandline_cli
5974794 Merge pull request #1782 from tianon/gentoo-docs
368d038 Fix documentation index for cli
58ffd03 add new docker api client for erlang, erldocker
9ce1d02 Add Gentoo documentation
251d126 Fixed typos
a0a5170 Merge pull request #1449 from spkane/honor-ENV-VAGRANT_DEFAULT_PROVIDER
b3a70d7 Compute dependency graph and upload layers in the right order when pushing
91ee679 pr #1718: Fetch docker gpg over https
52fe452 Changed docker apt repo URI from https to http because the http driver for apt is not installed by default
8465241 testing, issue #1620: Add index functional test on docker-ci
fac4ced Add a Docker example for running Riak.
ded9732 Move auth header on run cmd
dd4aab8 Use base64 encoding
d04beb7 Pass auth config through headers rather than as URL param
a260347 Merge on current master
ad322d7 Send corrent endpoint authentication when an image is pulled during the run cmd.
da3bb9a Move authConfig to a Parameter on postImagePush, too
0e6ee96 Merge pull request #1603 from dotcloud/773-docker-ci-pr
fcee605 Login against private registry
ea813d8 Update tar pkg revision number
d13c2ed Merge pull request #1317 from calavera/login_signal
75df495 Merge pull request #1758 from mattapperson/patch-1
f703b8b Merge pull request #1771 from thijsterlouw/missing_cli_docs
6380b42 Add 2 missing cli commands to docs (events + insert) and alphabetically order docker output
ce53e21 Read the stdin line properly.
35fef27 Merge branch 'login_signal' of https://github.com/calavera/docker into login_signal
fa3266e Merge branch 'master' into login_signal
e42d3a1 Added NodeJS library
3528990 Merge pull request #1665 from dotcloud/ksid-contrib-maintainer
8ee4473 Merge pull request #1704 from dhrp/ubuntu-install-finger-fingerprint
212b582 Merge pull request #1673 from xdissent/1659-upstart-order
969e48d Merge pull request #1752 from dotcloud/1750-build_error-fix
d9b7ec6 Merge pull request #1754 from griff/1705_changelog_fails_before_run
46c9c5c Made calling changelog before run return empty. Fixes #1705.
84431ec Merge pull request #1613 from thijsterlouw/proper_resolvconf_parsing
d605e82 fix error in docker build when param is not a directory
2ea1923 Merge pull request #1744 from dsissitka/patch-7
df36f9d Merge pull request #1749 from msiebuhr/doc-from-tags
74982bd Merge pull request #1738 from jonasi/error-to-stderr
6d769f4 Merge pull request #1743 from dotcloud/fix_version
1a8a540 Document FROM <image>:<tag> Dockerfile instruction.
6c206f7 Install Ubuntu raring backported kernel from official archives directly.
110d3b7 Merge pull request #1736 from ramonvanalteren/patch-1
c0e95fa Updated "Use -> The Basics" to use ubuntu:12.10.
e3b58d3 hide version when not available
9b029a0 Merge pull request #1739 from dotcloud/add-docs-dockerfile
49d35cc Merge pull request #1690 from jbbarth/code-formatting
c6702be added a Dockerfile which installs all deps and builds the docs.
690c383 Merge pull request #1710 from thomasf/master
050cf70 Merge pull request #1721 from andrewmunsell/patch-2
df8f95a Merge pull request #1591 from dotcloud/1557_fix_docker_run_useage
0f91418 Merge pull request #1729 from dsissitka/patch-6
4ff649c Unable to find image error should print to stderr
c4394de Merge pull request #1717 from metalivedev/1685-updateinstallation
f159f47 remove message during tests
740a97f use init function
eee6d3d add TEST env var during tests and silenced parserun during tests
559724a Update python_web_app.rst
3f141e1 Update remaining upstart scripts to wait for lxc-net
9f8e5a9 Use flag.StringVar to capture the command line flags.
78d995b Fix syscall name.
e7ee2f4 Remove unused imports.
b8a8962 Simplify term signal handler.
b54ba50 Add the ISIG syscall back to not kill the client withing a shell with ctrl+c.
f18889b Print a new line after getting the password from stdin.
6e4a818 Exit if there is any error reading from stdin.
2357fec Stop making a raw terminal to ask for registry login credentials.
23dc52f Allow to generate signals when termios is in raw mode.
c3154fd Use a more idiomatic syntax to capture the exit.
f1d0625 Exit from `docker login` on SIGTERM and SIGINT.
230dc07 fix logo path
c46d993 Merge pull request #1727 from dsissitka/patch-5
bcb081a Merge pull request #1708 from nexxy/patch-1
5789236 Fixed a minor syntax error.
0752532 Fixed a minor syntax error.
18d572a Added Emily Rose to AUTHORS.
37a2369 Add privileged flag in documentation for container creation
c1f6914 Correct number of asterisks.
b1eae31 Fix #1685: Notes on production use. General installation cleanup.
bf98fff Merge pull request #1674 from jbbarth/docs
e6c3da4 Merge pull request #1696 from daniel-garcia/1448-add_newline_every_logmessage
d5220bc Merge pull request #1711 from dotcloud/1709-start_doc-fix
66ef6c0 fix start doc
20772f9 Fix bash completion, remove have
69a93b3 Update docker_remote_api_v1.4.rst
466a88b added apt-key finger tip and fingerprint in ubuntu installation page
f0620da Merge pull request #1703 from metalivedev/621-usebaseimages
dffb72c Fix #621: add new use/base images section. Include examples.
1288930 Merge pull request #1698 from metalivedev/1684-Cleanup
98018df More descriptive, easier to process container portmappings information in the API
4a3b039 Merge pull request #1694 from dotcloud/troubleshoot_windows_installation
c627ff6 Fix #1684: Old Welcome is now Introduction. Working with Repos now follows Builder. Clean up some doc build errors. Removed old Manifesto. Tweaked layout javascript to allow direct link from first and last index elements.
d593f57 write newline after every log message.
c2b273d Merge pull request #1611 from pysqz/master
cc18a9c Also reuse forwarding ports
f861c49 Troubleshooting windows installation section
d80b50d Improve formatting with 'go fmt' as stated in CONTRIBUTING.md
5b84252 Merge pull request #1622 from TylerBrock/patch-2
f352ec9 ENTRYPOINT fixups
714e424 Merge pull request #1656 from KSid/vagrantfile-0.6
f7fa6c2 Merge pull request #1671 from kim0/patch-3
b866254 Merge pull request #1636 from unclejack/1594-return_non_zero_when_encountering_error
108b6c6 Merge pull request #1678 from dotcloud/remove-incorrect-build-instructions
9ce7b1c Merge pull request #1663 from KSid/1661-cp-parsing-error
076434e Remove incorrect build instructions
f280704 Merge pull request #1670 from tobstarr/patch-1
d4c7340 Merge pull request #1646 from mohitsoni/master
331f983 Start docker after lxc-net to prevent ip forwarding race
1adbadd Add mercurial to the list of packages needed in a dev environment
843ef64 Don't force a non-existent npm version, use latest from epel
4440bde Change fetching of gpg key from http to https
f83d556 Make Kawsar Saiyeed @KSid the maintainer for contributed tools
d8a18ea Display error if resource not specified
c864647 Merge pull request #1658 from jamescarr/patch-1
2891e82 Merge pull request #1657 from KSid/bash-completion-0.6
465d531 Update for new mailing list
02d1d23 Add latest docker options to docker.bash
1f85ed6 Update Vagrantfile to use docker apt repository
ef82690 Merge remote-tracking branch 'upstream/master'
f4432d5 Refactored code and added unit tests
820a3b9 Merge pull request #1634 from songgao/patch-1
99a8306 Merge release 0.6.1 back to master
bd16107 Merge pull request #1648 from dotcloud/bump_0.6.1
5105263 Bump to v0.6.1
7b5c579 Use correct upstart script with new build tool
dcfb993 Merge pull request #1642 from dotcloud/upstart-exec
dd9ee03 Merge pull request #1633 from abhirajbutala/patch-1
15d658d Removed duplicate mercurial install command
59281d6 use libffi-dev, don't build it from sources
29be20f Fixed: ImagePull in runtime test
5a8c32d Use additional decorator in RequestFactory to pass meta headers to registry
3d9b437 Use correct upstart script with new build tool
ab882da Fixes #1643
e2594d1 Merge pull request #1641 from dotcloud/docs-0.6-gpg-key
ebb9b5e Added adding the gpg key
98f9d3e Merge pull request #1562 from AnSavvides/contributing-link
091fb89 Added line on top of ubuntulinux announcing change in 0.6
db91cac Merge pull request #1635 from unclejack/fix_main_dockerfile
8dd3607 Merge pull request #1563 from dotcloud/1073_add_loading_message
3ebda17 Merge pull request #1637 from dhrp/change-docs-ubuntu-sources
9149c45 Merge pull request #1627 from shin-/registry_metaheaders
969ab9c Merged 0.6.0 release back to master
588f8e1 Merge pull request #1628 from dotcloud/bump_0.6.0
f753dfe Updated the docs to reflect we no longer use Launchpad and host our own repository.
d1ad0e2 return error if at least one container fails to start
72cfa3d use libffi-dev, don't build it from sources
3396a18 Update docker_remote_api.rst
1c6af60 Fixed: ImagePull in runtime test
ccc2276 Merge pull request #1630 from KSid/docker-build-dockerfile
78a71b1 Merge pull request #1587 from dotcloud/1559_improve_version
2191419 Removed duplicate mercurial install command
f4a4f1c Bump to 0.6.0
f925edd Merge pull request #1525 from griff/1503-fix
12715c8 Merge pull request #1609 from jpetazzo/release-docker-with-docker
093b85b Use additional decorator in RequestFactory to pass meta headers to registry
326dadd Merge pull request #1565 from dotcloud/only_load_authconfig_when_needed
a3510c9 Merge pull request #1560 from dotcloud/439-allow-lxc-args
262d57e Merge pull request #1623 from mhennings/1592-fix-race-conditions-in-parallel-pull
551092f Add lxc-conf flag to allow custom lxc options
3f802f4 Fix race conditions in parallel pull
d6f5304 Some fixes for MongoDB example
5e33864 testing, issue #773: Add infrastructure docker-ci PR documentation
0b9c8e2 Merge pull request #1596 from metalivedev/1149-easyfixes
42fe550 Merge pull request #1614 from denibertovic/docs
f5bd137 Add mongodb example
348696f Merge pull request #1607 from TylerBrock/mongodb
467dbb7 small fix to docs regarding adding docker groups
2f6ce27 Make sure 'Ghost' container is available with allocated IP
c349b4d Keep linebreaks and generalize code
62e8478 proper resolv.conf parsing
8a7c049 Remove -x flag — we do not want to be *that* verbose.
885afeb Bump up VERSION file to 0.5.3-dev
e06372d Update packaging/README to point to hack/release
b5a48ea Moved release scripts to hack/release and updated instructions.
a805905 +CHANGES is now -dirty (works better in URLs), and we have postinstall and prerm jobs.
c8c69a1 Bump to 0.5.3 (VERSION file)
0469e47 Release script also takes care of index file (if the S3 bucket is WS-enabled)
5b630d4 If there are changes, add the timestamp to the package version.
9c06420 Implement apt-secure repository signing.
8787200 Repository should also have i386 index, since Ubuntu is multi-arch by default
abfa7a2 Update to go 1.1.2.
5b0eaef Run reprepro from release, incrementally (it needs S3 credentials). Add virtual package.
9694fb8 Install python-magic (it helps s3cmd) and a convenience /src symlink
bfee2c7 Polish instructions a little bit.
ab4fb9b Add a check for S3 bucket access.
fbd5b20 Running the build image will now execute release.sh automatically.
ff30eb9 Protect the release.sh script against accidental use. Infer VERSION automatically.
749a7d0 Add a check to make sure that make.sh only runs within a container.
d9f7699 Cosmetic changes: rewrapping, `` → $()… before starting the real work
d750060 add "|| true" otherwise "set -e" kills us if the repo is clean
bdbac9f Upgrade Dockerfile with new dependency
1320177 Update release checklist. Still needs work.
ccc3969 release.sh: publish a full release of docker to a S3 bucket, including static binary and a full APT repository with install instructions
89ee524 Good-bye, ugly mega-Makefile. Docker can now be built with docker, with the help of a simple very simple shell script.
9fce6f6 docker -v: show version and build information without making remote connections
9087ef9 Move VERSION to a dedicated file to facilitate automated builds and releases
aa2ab51 Deprecate dockerbuilder in favor of a standard Dockerfile
2c147dd add mongodb image example
ee64e09 testing, issue #773: Automatically test pull requests on docker-ci
30726c3 Improve docker-ci deployment and tests
41973d4 fix typo
75f4fd9 Fix #1330 and #1149. Improve CMD, ENTRYPOINT, and attach docs.
646afab improve version
18962d0 load authConfig only when needed and fix useless WARNING
b22c973 Added escape sequence to tutorial
6aff117 Use flag.StringVar to capture the command line flags.
e69f714 Fix syscall name.
276d2bb Remove unused imports.
45543d0 Simplify term signal handler.
8a18999 Add the ISIG syscall back to not kill the client withing a shell with ctrl+c.
20b1e19 add loading message
f11fb70 Adding direct reference to contribution guidelines
c7cda86 Don't read from stdout in hijack unless attached. Fixes #1503
0e21de9 Assume that if VAGRANT_DEFAULT_PROVIDER is set we shouldn't install vbox tools
bdaa87f Print a new line after getting the password from stdin.
4089a20 Exit if there is any error reading from stdin.
75ac50a Stop making a raw terminal to ask for registry login credentials.
58e0c68 Merge branch 'master' into login_signal
bb06fe8 Allow to generate signals when termios is in raw mode.
7cc90f2 Use a more idiomatic syntax to capture the exit.
01ce312 Exit from `docker login` on SIGTERM and SIGINT.

git-subtree-dir: github.com/dotcloud/docker
git-subtree-split: e89396809fc3cc9a52e7787f829a8b96c7cee4a4
Merge commit 'ce1f0b5131d1b2eb169143ee03a578919c69a94a'
Squashed 'github.com/dotcloud/openstack-docker/' changes from 8c4678b..b9aeb16

b9aeb16 Update README.md
fee4973 Addressed last comments on patchset #21
2855f8b Addressed all last comments in patchset 20
a2d11ba bcwaldon: pep8 fixes
37353ae Merge branch 'master' of github.com:dotcloud/openstack-docker
744918d Added support for supported_instances arg
c115e29 Added support for supported_instances arg
e000ed5 Various changes following Nova review on gerrit
05608e8 Removed default ubuntu from tests
c477bf8 Merge branch 'master' of github.com:dotcloud/openstack-docker
b54ffed Fix tests
b3dd648 Removed useless function
4a5af48 Add missing header
e09f734 remov default image
7c6429e flake8 cleaning
76c0816 Implemented snapshots and fix some tests
598d776 Merge pull request #11 from bcwaldon/client-testing
2ab3fa6 Reinitialize UnixHTTPConnection per request
584727c Add tests for DockerHTTPClient
0d4f915 Add note about infinite loop
1ca5968 Drop configurable stop_container timeout
5ca35f4 Simplify socket connection class code
662abf8 Move is_daemon_running from client to driver
b35cba4 Move get_registry_port from client to driver
be17ae1 Update README.md
60234b7 Merge pull request #7 from paulczar/master
bdcfb70 Merge pull request #10 from bcwaldon/fix-tests
4dfc1b2 Fix instantiation of a fake DockerDriver
3db2160 Set class-level driver init values
df60aed Document why _get_running_instance is overridden
4b05101 Added tests for hostinfo
35ac7ad No need to alias nova.tests.utils
cb6b917 Use module imports
659979e Merge branch 'master' of github.com:dotcloud/openstack-docker
aac98fe Moved the test to a tests dir
3821401 Update nova_blueprint.md
4e06186 Added some more details in the Blueprint (documented the user workflow)
e4e388d Check container_format before spawning the instance
602fa14 Fixed image pull when the image does not exist in Docker but exists in Glance
0defa4a Various fixes and improvements
015b65f setup script for openstack cluster using rcbops

git-subtree-dir: github.com/dotcloud/openstack-docker
git-subtree-split: b9aeb1613238221990b25c568c7cff53e7ff13ae
Merge commit '6df2d9bf8a3af2a1688fbe582b59e8c5c6972c1b'
Squashed 'github.com/ehazlett/shipyard/' changes from 2a7356d..7e3ea38

7e3ea38 updated docker config to include hipache for shipyard image
497227d updated readme
6600f04 updated readme (new ui screenshots)
aa6261d fixed bug with application container list (host)
b94ad7d fixed bug with application container list
9bb9431 fixed bug with syncdb
ad5e237 Merge branch 'ui-refresh'
04547e7 removed dashboard app
389ef84 removed link from images ; will add details later
6e56284 updated to stay on app details if container port invalid
45d5b49 re-mapped django message to match bootstrap
fd3e302 removed background task for hipache updates
015d190 fixed bug with m2m save on apps
3db6796 added support for editing applications
9e421cc updated readme ; removed import/search actions for images for now
bb9eb79 minor ui update
3421e80 added enable/disable for hosts
dbd7b8e added ability to add hosts
47a3d69 added new ui for hosts
8f39573 added new ui for applications
8373506 added new ui for images
454f4dc added logs view for container
5e69f75 added ability to edit container descriptions
e501f0d minor ui updates to containers
ba78af5 finished new ui for containers
a5998b0 more ui updates ; container details, actions, etc.
bd0dacb fixed login ui issues
d68840a started ui refresh ; bootstrap 3 ; redesign of container view
cc4dd70 Merge branch 'gh-35'
8c2183f fixes #35: add support for privileged containers
364dbe3 updated readme
1da1a3c updated readme
ef6612f minor ui fixes
27cdba3 updated attach template to use packaged jquery
f912fb5 minor ui fixes
54b4c5a updated vagrantfile (more ram) ; added check for already provisioned vagrant vm
9ac0068 Merge branch 'gh-37'
3611f89 added validation for docker hostnames
455f3db Merge branch 'vagrant-provisioning'
d0c2be8 updated Vagrantfile for new version ; fixed vagrant provisioning error (docker package unauthenticated)
30b7db9 minor ui fixes
93cc264 added split filter
64984ce minor ui fixes
872112a updated bootstrap ; minor ui fixes
0edb181 minor ui fixes
2c24a31 minor ui updates ; container actions moved to a dropdown ; removed container status ; filtered images that have no repository name
2b0f552 updated image view - will only show images with a repository name to reduce clutter
55ead6a updated readme
1e6d41b added management command to purge container metadata for terminated containers
47432f2 updated attach icon
7de1d41 fixes #26: does not crash when docker hosts are unavailable
10ba65c updated provision for docker 0.6
2cfd841 removed django-secure in favor of SECURE_PROXY_SSL_HEADER
d669bdb added django-secure
ccb2dd1 updated docker run script
f352819 fixed bug with extra commands with docker run
63198fe added support for extra commands with docker run
3ce86d9 fixed provisioning for new docker build process
5612eb0 Merge branch 'terminal'
f3ffe4e Merge branch 'master' into terminal
e87fd6b Merge branch 'master' into terminal
4e0b85a more tweaks on terminal support from ukd1 and diffoperator
6576726 Attach terminal for shipyard.

git-subtree-dir: github.com/ehazlett/shipyard
git-subtree-split: 7e3ea38ee2a2add07673a715848638605cb561e3
Merge commit 'b822b9d652410955aa876b32fe19c4053eefe386'
Squashed 'github.com/fsouza/go-dockerclient/' changes from dba75fc..586a391

586a391 container: ExportContainer now receives io.Writer since we don't need to close
811234f container: ExportContainer now receives output to write as argument
14b6ad9 container: implemented client.ExportContainer
6bf142f image_test: created stdout mock
fa54503 client: injecting stdout
1dbe76b container_test: using newTestClient function instead of manually instantiating client structure
4699f60 image.ImportImage: opening file when source is a path.
ad10578 image: improving test for ImportImage when source is stdin
3efc345 image: passing stdin to body when requesting image creation
7d2a2c2 client: injecting stdin on NewClient
be36d80 image: start implementation of ImportImage.
9cc1ae8 testing: improve removeImage

git-subtree-dir: github.com/fsouza/go-dockerclient
git-subtree-split: 586a3911ca8df7759c6756cabb8e558e295ee151
Merge commit 'ba73a727d3e057d35a308b64ad5bdfaf93344b91'
Squashed 'github.com/globocom/docker-cluster/' changes from 00eb779..af9fc03

af9fc03 cluster/image.go: naming go-dockerclient import to dcli
b598188 cluster/container: implementing ExportContainer
aba11dc CONTRIBUTORS: sorting..
31043b9 CONTRIBUTORS: adding myself
cb21389 cluster/image: passing wait parameter to runOnNodes
7752f87 cluster/image_test: testing ImportImage from absent file
2bb2c3b cluster/image: initial ImportImage implementation

git-subtree-dir: github.com/globocom/docker-cluster
git-subtree-split: af9fc03e71670ad937785e7c09d5509cfe5c9776
Merge commit 'a43c37e9a8c037f7ffd679a3fafae561a04e8a1d'
Squashed 'github.com/globocom/tsuru/' changes from a2b5ff8..a5b4686

a5b4686 adding centos as a valid platform for tsuru with docker
cd37d9e adding centos as a valid platform for tsuru with docker
1261c24 Update index.rst
6aceec4 removing AUFS fix from the documentation as it was solved here: https://github.com/sciurus/docker-rhel-rpm/issues/2
6c1fce5 some fixes in the documentation, the install script and tsuru-docker.conf
e343c7b docs/apps/quickstart/python: updating git remote url
c78e4bc provision/docker/flatten: filtering images that needs flatten
d2df063 tsuru-admin: unexport logRemove.
1203c9a tsuru-admin: registering log-remove.
d07bdb5 tsuru-admin: implement log-remove.
3354182 tsuru-admin: added info about log-remove cmd.
7e73b24 fix link format
e36b89e fix link format
7720681 fix some steps in docker install session
007c5ce fix Tsurus Dependencies session
8e9dcb9 fix doc format
943d249 addinng howto install docker + tsuru on centos
abe893b api: use auth.CreateTeam
f09b3ca auth: add CreateTeam function
809d268 cmd: don't strip leading slashes on writeTarget
b820fc4 docs: fixed navigation.
70ed530 api: fixed url for log in tests.
32ac144 api: added router for remove logs.
578904d api: remove log by app.
fe343ef api: added handler to remove logs.
e74e6dd apps/log: remove log by app.
a281f3e log: remove logs.
45d6ff1 contributors: added the one line for the magno emails.
fbada86 docker: using -q to ignore ssh warnings.
7060d49 docker: ignoring the ssh warning.
a8aaf26 cmd/tsuru: bump to 0.8.4.
d178867 router: returning error when the backend is not found.
fac03ff juju: using router swap.
a3c3113 docker: using router Swap.
e1e7ccb router: fixed the fake router behaviour.
ada3e64 router: storing the backend name.
fdcbc50 router: implemented swapBackendName.
bfa1628 Merge branch 'master' of github.com:globocom/tsuru
2c3ce5e adding how to extend an application
830cc2f router: refactored swap.
f2c9a57 router/hipache: implemented swap.
8189271 app: return empty list instead of nil on LastLogs
625fd41 fixed Sprintf pattern.
a013553 go fmt.
d3964b8 routes: implemented swap for elb.
eaf4adb router: simplified the import.
f5f246f router: added Swap method.
5e407a6 router: implemented retrieve.
6ef2595 router: implemented remove.
e71aabd router: implemented store.
0905027 router: using gocheck.
578443f cmd: implemented run --once.
3179285 api: added support for run commands once.
e810a4e app: added support for run once.
e86fd3e app: added once parameter in source and run methods.
8c8a75e app: added once parameter in Run.
554f705 fs/testing: use atomic ops to prevent data races on FakeFile.current
9359c4e provision/docker: prevent nil pointer dereference on error stream
a87f6e7 app: fix some bugs in LogListener
dfce60a docker: implemented ExecuteCommandOnce.
c8f485e juju: refactored ExecuteCommand and ExecuteCommandOnce.
ce68474 juju: using startedUnits in ExecuteCommandOnce.
e736414 juju: implemented startedUnits.
ea3bbdb removed comments.
09314f3 juju: implemented ExecuteCommandOnce.
8f8d47b fixing a typo
3b115a6 contributors: adding magno torres
7244ddc Update index.rst
cefa58a Update quickstart.rst
d211969 fixing the format in the session Listing dependencies
c59eba7 fixing the format in the session application code again
11cf73b fixing the format in the session application code
a6f7ad1 Merge branch 'master' of github.com:globocom/tsuru
24fb0b0 Adding documentation of how Deploying PHP applications in tsuru
7674cea provision/docker: also remove image from the registry server
e925956 api/app: incrementing app.Deploys field on deploy api endpoint
c3b864a app/app: adding Deploys field to track deployment number

git-subtree-dir: github.com/globocom/tsuru
git-subtree-split: a5b46861110a5162128dea7ab044a8a5fbebba90
Merge commit 'ae3c1aa4de32b9850e2977ed570de11441d88e59'
Squashed 'github.com/jpetazzo/dind/' changes from b0a906c..8a69d92

8a69d92 Fix typo for AppArmor workaround.

git-subtree-dir: github.com/jpetazzo/dind
git-subtree-split: 8a69d9201d868d7146937a630ed2e778ff5719c2
Merge commit 'd0e361f8377d4609165310f12572724a9b1b532b'
Squashed 'github.com/kencochrane/docker-tutorial/' changes from 44887f9..33fce0f

33fce0f actually add the file this time
9cec884 renamed docker-tutorial to docker-guidebook

git-subtree-dir: github.com/kencochrane/docker-tutorial
git-subtree-split: 33fce0f31cc611d576191966c21fe15b4d3cc03f
Merge commit '8c37b8f012b3819d25aef341c6375cdcccc955d6'