https://github.com/andrewh/dockerfiles.git
Squashed 'github.com/andrewh/dockerfiles/' content from commit 918812b

git-subtree-dir: github.com/andrewh/dockerfiles
git-subtree-split: 918812bccbab286ce2390ef2b2b3cf0a02780918
Merge commit '695e913abdc300cd0a3341fe97cecbab218bbe81' as 'github.com/andrewh/dockerfiles'
Squashed 'github.com/aschmidt75/haproxy-docker-config/' changes from f260102..6b7b4ab

6b7b4ab integrated
3f36d4b removed
9001260 added testbase to ignore
8081f65 updated

git-subtree-dir: github.com/aschmidt75/haproxy-docker-config
git-subtree-split: 6b7b4aba041778090516a7e298f350e736e91f6e
Merge commit 'e3f074a18b6857d14f739f09d5b19c23c9f7d76d'
Squashed 'github.com/dotcloud/docker-registry/' changes from 9a17c2d..c811c8c

c811c8c Update README.md
cc4fb45 Merge pull request #24 from dynport/add-dockerfile
2a948ca add Dockerfile
f69fef1 Update README.md
3c78354 Tarsum fixed
cdd4dc2 Disabled checksum format check with hashlib
47e95fd Fixed tarsum when the file content does not exist
6285cfe Fixed tarsum when the file content does not exist

git-subtree-dir: github.com/dotcloud/docker-registry
git-subtree-split: c811c8cefb289628af17b1de78ff0d6f66584a1a
Merge commit '41eb5d432f9a2298f59fa3706a08b11bf20b0e60'
Squashed 'github.com/dotcloud/docker/' changes from 9b57f91..9a15db2

9a15db2 Merge pull request #1269 from dhrp/new-website-links
58a1c57 Added new docker logo to the documentation header, and added other links.
6745bdd Typo in 3rd-party
5714f0a Hack: completed step 12 of the bootcamp
ce43f4a Hack: first draft of the maintainer boot camp. Work in progress!
5d1609f Merge pull request #1265 from dotcloud/better-bridge-defaults
4714f10 Allocate a /16 IP range by default, with fallback to /24. Try a total of 12 ranges instead of 3.
a675da6 Merge pull request #1262 from dotcloud/1253_add_directory_check
e397556 Merge pull request #1236 from dotcloud/1234_overwrites_expose-fix
9adba5e Merge pull request #1264 from dotcloud/fix_tests_env
5c1af38 fix test env
8ea9ccf Merge pull request #1244 from dotcloud/1020_add_variable
74a2b13 fix error message when invalid directory
4e7f2b7 Merge pull request #1158 from cespare/1142-docker-add-fix
2bba279 Merge pull request #1259 from dsissitka/patch-3
56da77a Merge pull request #1258 from dsissitka/patch-2
494b575 Merge pull request #1255 from dsissitka/patch-1
c383d59 Update ADD documentation to specify new behavior.
416fdaa Remove some trailing whitespace.
2b0ebf5 Buildfile: for ADD command, determine filename from URL.
f236e62 Test pulling remote files using ADD in a buildfile.
1d02a7f Updated the stop command's docs.
7889351 Added top to the list of commands in the sidebar.
32663bf Fixed a couple of minor syntax errors.
e3be2e9 Merge pull request #1242 from dotcloud/remove_usage_from_test
67f1e3f add container=lxc in default env
23ea9b8 Merge pull request #1235 from metalivedev/cleandocbld
ea12588 remove usage from tests
6e2e4ca Merge pull request #1204 from dotcloud/tests-less-copypaste
2e0e455 rebase master
d93742f Merge pull request #1239 from dotcloud/fix_utils_tests
2e3b660 fix error in utils tests
0bd534a Merge pull request #1211 from dotcloud/new_logs
e59dd2c Merge pull request #1159 from unclejack/add_container_id_file_to_run
25be792 create the cidfile before creating the container
2a3b91e docs - add example for cidfile
221ee50 docs - add cidfile flag to run docs
64e74ce add support for container ID files (a la pidfile)
2b5386f add regression test from @crosbymichael
a0eec14 fix overwrites EXPOSE
54f9cdb Make docs build without warnings or errors. Minor additional cleanup.
d6fb313 Merge pull request #1207 from crosbymichael/819-use-persistent-volume
0aa2470 Merge pull request #1232 from dotcloud/1217-testing-coverage
edc68f8 Merge pull request #1230 from dotcloud/switch_dev
0089dd0 switch version to -dev
51f6c4a Merge pull request #1227 from dotcloud/bump_0.5.0
f4eaec3 Merge pull request #1226 from metalivedev/easydockerfile
b083418 change -b -> -v and add udp example
5794857 Merge pull request #1169 from crosbymichael/buildfile-tests
e7f3f6f Add unit tests for buildfile config instructions
1b0fd7e add debug and simplify docker logs
a926cd4 add legacy support
aa56714 Make dockerfile docs easier to find. Clean up formatting.
f8dfd0a Merge pull request #1225 from dotcloud/hotfix_docker_rmi
3dbf9c6 Merge pull request #1219 from metalivedev/docs-repoupdate
de563a3 Merge pull request #1194 from crosbymichael/build-verbose
9cf2b41 change rm usage in docs
f310b87 Merge branch 'master' of https://github.com/kencochrane/docker into kencochrane-master
ac14c46 Changed date on changelog
578e888 Merge pull request #1212 from dotcloud/merge_v_b_options
5231bf3 Merge pull request #1222 from lopter/master
8af945f Small changes in changelog wording
d0e8ca1 updated with notes from @vieux
5a934fc fix docker rmi via id
c766d06 Always stop the opposite goroutine in network_proxy.go (closes #1213)
0356081 Update repository information.
6e8bfc8 Testing, issue #1217: Add coverage testing into docker-ci
18e91d5 Update docs
1004d57 Hotfix: make sure ./utils tests pass
f9e4ef5 Merge pull request #1210 from dotcloud/improve_configmerge
eefbadd Merge -b and -v options
bc21b3e Bump version to 0.5.0
608fb2a Merge pull request #1184 from dotcloud/1176-packaging-release
92cbb7c Do not overwrite container volumes from config
45050d9 Merge pull request #1188 from dotcloud/1174-packaging-binary
75a0052 packaging, issue #1176: Document PPA release step
c8efd08 Merge pull request #1208 from crosbymichael/1201-rw-volumes-from
454cd14 Merge pull request #1096 from dotcloud/remove_os_user
e41507b Add unit test to check wrong uid case
599f85d store both logs in a same file, as JSON
5756ba9 Merge branch 'master' into new_logs
193a7e1 improve mergeconfig, if dns, portspec, env or volumes specify in docker run, apend and not replace
5ae8c7a Copy VolumesRW values when using --volumes-from
080243f Hack: use helper functions in tests for less copy-pasting
364f48d updated the rmi command docs, the had typos
4174e7a updated the help commands on a few commands that were not correct
eb38750 Remove the os.user dependency and manually lookup /etc/passwd instead
d0c73c2 Add param to api docs for verbose build output
1104d44 Revert changes from PR 1030
49044a9 Fix buildfile tests after rebase
474191d Add verbose output to docker build
941e3e2 wip
bf26ae0 Packaging, issue #1174: Add pure binary to docker release

git-subtree-dir: github.com/dotcloud/docker
git-subtree-split: 9a15db21a6d6b49d4f9626f89f7dfdb276ce7618
Merge commit 'cb1a65b3b99d08764059804d7ae05ebb6d561f14'
Squashed 'github.com/dynport/docker-private-registry/' changes from a1a3dc5..5a183e0

5a183e0 update README for current master, add and use Dockerfile
ffb5bcd update README.md

git-subtree-dir: github.com/dynport/docker-private-registry
git-subtree-split: 5a183e024f22dfad9c4e8eafbe4c523b66c2a5b0
Merge commit 'daec5bd222ce63f214116609ceb42694437e7cdf'
Squashed 'github.com/ehazlett/shipyard/' changes from 9aeaaa9..7befd05

7befd05 fixed container refresh
3ac7960 fixed cache issue with containers (again)
b373d64 fixed cache issue with containers
b27e14e fixes #1: remove images
e4b7ace fixes #18: fixes ui bug with selector on other tabs
718530d fixes #18: show all containers
1d4502c fixed bug with update_admin_user management command
24cd293 fixes #25: ui spinner shows if no containers or hosts
231a0bc fixes #24: added Dockerfile; removed initial.json (using in dockerfile now)
57708dd Merge pull request #22 from xdissent/tcp-ports
8ae0763 Use get_ports method in dashboard template.
96362bd Use TCP ports only (new docker api)

git-subtree-dir: github.com/ehazlett/shipyard
git-subtree-split: 7befd05a317bf47a5aa6a4f4fee2d9661a3d6918
Merge commit '44269f9e03a3fc589ccd45b613ac095b9fb1d397'
Squashed 'github.com/globocom/docker-cluster/' changes from 62c0153..57fe180

57fe180 cluster: call Storage.Remove on RemoveContainer
7b0b45b storage: add edge case test
dfde968 storage: fix bug in Retrieve when container does not exist
591e53d storage: include Remove calls in the "integration" tests
54c98d8 storage: implement redisStorage.Remove
401264f cluster: add Storage.Remove
342b2bc storage: add functions to get the storage instance
825fb57 storage: fix code
109ccf4 storage/tests: add type to start redis server on demmand
1e62124 travis: run tests from all packages
785febb storage: implement Retrieve in the redis storage
b9aaf4e storage: starting package

git-subtree-dir: github.com/globocom/docker-cluster
git-subtree-split: 57fe180c6a7838541f4f1cee305a1866ae765ab7
Merge commit 'e2095da90f6d3ad836de82e35b64c9714a9246b2'
Squashed 'github.com/globocom/tsuru/' changes from 2f798cd..a8b26be

a8b26be cmd/tsuru: registering swap cmd.
e194ff0 cmd/swap: added test to verify that swap is a command.
4d002c8 api: fixed url for swap handler.
9044806 misc/build-clients: add -d flag
f530a2f misc/build-clients: remove -s ldflag
0324d66 provision/docker: use redis storage when configured to
751ad10 Makefile: add target for deadcode detection
adc32a3 provision/docker: use segregatedScheduler when docker:segregate is true
0f3d4b6 provision/docker: unexport getRouter
cc36c7f provision/docker: register the command to list nodes in the proviisoner
0c1c7c6 provision/docker: create listNodesInTheSchedulerCmd command
514a030 provision/docker: register removeNodeFromSchedulerCmd in the provisioner
3b48b1e provision/docker: unexport scheduler errors
eb15e32 provision/docker: create removeNodeFromSchedulerCmd
59864a3 provision/docker: register addNodeToSchedulerCmd
8a1bb3a provision/docker: simplify test
184159e provision/docker: create addNodeToSchedulerCmd
84188a8 provision/docker: add listNodesInTheScheduler function
b48e95e provision/docker: unexport removeNodeFromScheduler
313ba1d provision/docker: unexport addNodeToScheduler
bef1eda provision: move tests to gocheck
75de1c9 provision: fix year in the license banner
9d86853 collector: fix fatal
b4ec92c api: fix fatal
96750f4 cmd/tsr: always read configuration from default file
201c699 cmd/tsr: update command help
4a1c79a cmd/tsr: register all commands from all provisioners
1a12165 testing: add CommandableProvisioner
a1e56e2 provision: add Registry function
73820c3 cmd/tsr: fix tests
74c7d28 cmd/tsr: fix api test
5debc3f cmd/tsr: use tsrCommand in main
79d2bdb cmd/tsr: remove config flag definition from apiCmd
78a58ab api: improve RunServer function
309b4df cmd/tsr: add tsrCommand
b761832 cmd/tsr/testdata: add another sample configuration file
04ea7ab cmd/tsr: remove flag definition from main
2feb2f8 cmd/tsr: delete some dead code from token.go
a40a4e1 cmd/tsr: remove config from collector command
eb2831f cmd/tsr: remove flags from the token subcommand
cd6cdf4 collector: simplify Run
ac345e0 cmd/tsr: read configuration file in main
f72adfd Makefile: fix test target
2a3fdf8 Makefile: break out test target in smaller pieces
5b3339c Revert "cmd/tsr: read configuration file in main"
95d72db testing: delete transport stuff
b70f647 cmd/tsuru: use cmd/testing instead of just testing
224a107 cmd/tsuru-base: use cmd/testing instead of testing
596c133 cmd/tsuru-admin: use cmd/testing instead of testing
f1c5467 cmd/crane: use cmd/testing instead of testing
5878cdc cmd: use cmd/testing instead of testing
89b6f4d cmd/testing: extract transport stuff from testing package
dc4a533 cmd/tsr: read configuration file in main
1fc1166 fabfile: don't force user to be ubuntu
0245065 fs/testing: make RecordingFs thread safer
0d921be provision: add Commandable interface
36d599c provision/docker: introduce new RemoveNodeFromScheduler function
8e32584 provision/docker: improve error handling on AddNodeToScheduler
fda45be provision/docker: introduce the function AddNodeToScheduler
c321d65 provision/docker/provisioner.go: removing call to removeImage
5ca4bfe provision/docker/docker.go: fixed typo on log
559b7a1 provision/docker/provisioner: extracting removeImage call from removeContainer
cfd1c86 misc/proxy-setup: also exporting no_proxy
98b7297 misc/docker-setup: installing from latest instead of master
087c866 remove nginx router.
1d2ba4a docs: removed reference for nginx.
d2bb28a remove nginx import from provisioner.
6c4d4b7 removing lxc scripts.
3c81476 removed lxc import.
40744e5 removing lxc provisioner.
5716f93 removing lxc.rst.
040a4cb docs: removing lxc reference from why.
7bdd247 removing lxc reference from index.
05db249 Merge pull request #504 from dgryski/docker-setup-preserve-cwd
961b23c docker-setup: don't change CWD to avoid confusing later setup pieces.

git-subtree-dir: github.com/globocom/tsuru
git-subtree-split: a8b26bec668b2b1fd171fe713dc1c5f0aafaada0
Merge commit 'eeb0398fe9db097768ff2bc2751ae322ba6761aa'
Squashed 'github.com/kstaken/dockerfile-examples/' changes from aff8f4c..f9abea1

f9abea1 Tweaking the examples for demos
0913f8d Adding a simple node app to the nodejs example

git-subtree-dir: github.com/kstaken/dockerfile-examples
git-subtree-split: f9abea116eeed085eca76fdbce0ee3cb8a0a639d
Merge commit '86f09cfc8c8b18f1ab23ca4e31e02cfd3c59fb22'
Squashed 'github.com/kstaken/dockermix/' changes from 79ff7f3..d41e7f5

d41e7f5 Adding control over individual nodes in an environment
4bd52be Adding a draft mongo replicaset example. Not fully functional yet
fccfa75 Fixing formatting of features
30ebb7c Updating documentation and tests for Docker 0.5
237691e Updating documentation and enabling all tests
2b0c886 Correctly adding to an env that alreday exists
0fa5420 Initial setting of dependency environment based on require
de64610 Updating docs example with the new require syntax
95504d0 Enabling all the tests
101231b Passing container count test
92973cb Correcting count test
f63d2bb Adding require count
45a09c2 Refactoring require so that it can support more flexible configuration including counts
33be0de Cleanup the count code
7039262 intial support for launching multiple instances and some fixes to the command line tools
2e866cb Code restructuring and cleaning up dependencies
ee733a0 Renaming the first example
35b7339 Adding the first almost practical example
6b8163b Updating readme
0683b6a Restoring Dockerfile support and testing with the latest docker-py
1bf4f6f Removing old example
06e77ea Updating readme
2504dcf Removing some unneeded comments
8b8164b Initial implementation of container dependencies and port mapping
a1a0f14 Test pass for Container using the changed format
1bec44b Starting to change over config format to support require

git-subtree-dir: github.com/kstaken/dockermix
git-subtree-split: d41e7f5251b9df35f3470f94f06965cc45eb446b