more projects
Squashed 'github.com/crosbymichael/dockerui/' changes from addb62f..e5dab43

e5dab43 Merge branch 'dev'
a2a8c48 Fix start container form model
fde898a Do not display empty changes
b516fcd Change tag url params
3985e60 Add err message when image or container not found
20f67f9 Add bottom status bar with version information
ac8f847 Small readme update
b77fb1a Merge branch 'dev'
5ff3e28 Update home page with dashboard partials
85a97e7 Controller cleanup
e7ef1ae Update README with todo
1a11d7b Add api version
528565a Update settings with endpoint

git-subtree-dir: github.com/crosbymichael/dockerui
git-subtree-split: e5dab43f4654ee97059131436c112c80a527aa9b
Merge commit '5f4ea3022ed06870d35af96b421d779d6831a7e9'
Squashed 'github.com/dotcloud/docker-registry/' changes from c96ed67..8ff4145

8ff4145 Fixed S3Storage.list_directory when root_path is /

git-subtree-dir: github.com/dotcloud/docker-registry
git-subtree-split: 8ff41455e13eca84967514d27adfc19c499c6464
Merge commit 'ab549207a300ad5a5dff09120ab9ce8e02be92b7'
Squashed 'github.com/dotcloud/docker/' changes from 092c761..389db5f

389db5f Merge pull request #887 from dotcloud/761-packaging-dockerbuilder
6746c38 FIXMEs
30f6045 Merge pull request #895 from dotcloud/build-fixes
080f35f Fix a bug which caused builds to fail if ADD was the first command
5799806 FIXMEs
14265d9 Various FIXME items
17235eb Merge branch 'master' of ssh://github.com/dotcloud/docker
7f11851 Remove duplicate 'WARNING'
250e47e Merge branch 'dns_server_side'
f413fb8 Merge pull request #857 from edx/856-vagrant-port-forwarding
f0e43dc Merge pull request #607 from dotcloud/expose_api_port_vagrant-feature
813771e Merge pull request #892 from unclejack/validate_memory_limits
d3f83a6 add test: fail to create container if mem limit < 512KB
7958f1f Add examples for local import.
4a02c6d Merge pull request #816 from unclejack/524-fix_aufs_links_related_warnings
165d343 Merge pull request #663 from dotcloud/662-fix_push_html_404-fix
c701de9 Merge branch 'master' of ssh://github.com/dotcloud/docker
05b87d2 Merge pull request #868 from dotcloud/postupload-endpoints-header
78e4a38 Merge branch 'master' into postupload-endpoints-header
822abab install aufs-tools when setting up the testing vagrant box
f1d16ea install aufs-tools when setting up the hack vagrant box
fb7eaf6 add aufs-tools package to dev env docs page
e53721e add aufs-tools to lxc-docker dependencies
2f67a62 run auplink before unmounting aufs
9ee1116 validate memory limits & error out if less than 512 KB
e49f82b update docs
ddf5a19 Merge branch 'master' into 22-add_sizes_images_and_containers-feature
00cf2a1 fix virtual size on images
3384943 Packaging, dockerbuilder: Automate pushing docker binary packages
452128f Remove run() where it is not needed within the builder
2eaa0a1 Fix non-tty run issue
8085754 Merge pull request #751 from dotcloud/660-auth_client-feature
c46382b rebase master
42d1c36 Fix merge issue
51a4b65 Merge pull request #883 from unclejack/build-docker-with-go1.1.1
30fb45c Merge pull request #799 from dotcloud/691-run_id-feature
9cdd39e Merge branch 'master' into 691-run_id-feature
45a8945 added test
697282d Merge pull request #804 from dotcloud/no_stdout_stale-fix
78a76ad use Go 1.1.1 to build docker
5ecfe13 Merge branch '610-improve_rmi-feature'
0bc1c6d Merge pull request #826 from dotcloud/825-move_xino_shm-fix
f57175c FIXME: a loose collection of FIXMEs for internal use by the maintainers
81a11a3 Update NOTICE
04cca09 Update README.md
48897b5 Merge pull request #845 from unclejack/841-update_docs_no_add_without_context
ecae342 New roadmap item: advanced port redirections
f238315 bump to master
b4565af Merge branch 'master' of ssh://github.com/dotcloud/docker
c85e775 Merge pull request #844 from dotcloud/843-inspect_multiple_params-feature
3491df6 Merge pull request #852 from dotcloud/556-docker-search-fmt
0e6ec57 Merge pull request #874 from fsouza/fix-build-newline
f37b158 Merge pull request #877 from fsouza/fix-hijack
da54aba commands: use in instead of os.Stdin in hijack
5edafd6 Merge branch 'master' of ssh://github.com/dotcloud/docker
d64f105 Added a readme explaining the role of each API
be15d5f Merge branch 'master' of ssh://github.com/dotcloud/docker
5918a5a More principles. Raw and unstructured to spawn discussion.
2e9403b build: don't ignore last line in Dockerfile when it doesn't end with \n
66d9a73 rebump
db3242e Send X-Docker-Endpoints header when validating the images upload with the index at the end of a push
7169212 Fix typo
302660e Add an option to forward all ports to the vagrant host that have been exported from docker containers
8d4282c Remove CR/NL from description in docker CLI. Also moved description shortening to the client
4b3a381 docs: build: ADD copies just needed data w/ full path
efa7ea5 docs: warn about build data tx & ADD w/o context
afd325a Solve an issue with the -dns in daemon mode
a3f6054 Check for local dns server and output a warning
4107701 add [] and move errors to stderr
a799cda allow multiple params in inspect
84d6800 Add -dns to docker daemon
bf63cb9 bump to master again
ce00418 bump to master
f67ea78 move xino stuff to /dev/shm
6255112 updated doc
c906239 bump to master
63e8038 Fix nil pointer on some situatuion
b6825f9 bump to master
0ca8844 Fix stale command with stdout is not allocated
d26a3b3 allow docker run <name>:<id>
7e59b83 removed auth in pull
a55a0d3 ([a-z0-9_]{4,30})/([a-zA-Z0-9-_.]+)
ca902b6 bump master
844a8db add debug
3dd1e4d added docs and moved to api version 1.2
62c7869 bump to master
9060b5c added proper returns type, move the auto-prune in v1.1 api
3afdd82 bump to master
5aa95b6 WIP needs to fix HTTP error codes
054451f NON-WORKING: Beginning of rmi refactor
49e6568 move auth to the client WIP
c05e9f8 Error output fix for docker rmi
7e92302 auto prune WIP
94f0d47 refacto
2eb4e2a removed the -f
ea9095c merge master
1c946ef fix: Can't lookup root of unregistered image
b45143d switch to SI standard and add test
ed56b6a fix typo
6fce89e bump to master
4489005 add regexp check on repo's name
67b20f2 add check to see if the image isn't parent of another and add -f to force
6102552 Merge branch 'master' into 610-improve_rmi-feature
d767327 check if the image to delete isn't parent of another
f01990a fix
db1e965 Merge fixes + cleanup
2ae8aaa Merge branch 'master' into 610-improve_rmi-feature
c80448c improve rmi
c75942c add 4243 port forward
a91b710 add sizes in images and containers

git-subtree-dir: github.com/dotcloud/docker
git-subtree-split: 389db5f5987e927bf2f8f90ea536fec3a95ac1cb
Merge commit 'ce9e0fce5b683852a57aad72ef3c70f9a279c517'
Squashed 'github.com/dotcloud/openstack-docker/' changes from 12e0a8e..c51261d

c51261d Implemented get_host_stats and get_available_resource in the Nova driver
69cd9df More Flak8 fixes
90cadf1 Now passes Flake8 tests
2e603f7 Merge branch 'master' of github.com:dotcloud/openstack-docker
639bb26 Implemented Mock Docker client to run unit tests without relying on the Docker daemon client. The driver now passes the Nova virt driver API unit tests.

git-subtree-dir: github.com/dotcloud/openstack-docker
git-subtree-split: c51261dae0a1c2cd3b03bc94fc68e156268c6d45
Merge commit 'd095482da0e89b6ad5824d84b666f35c70bbee03'
Squashed 'github.com/dynport/dockland/' content from commit 5a02db9

git-subtree-dir: github.com/dynport/dockland
git-subtree-split: 5a02db9d2001c5a424b1f66c3fb1d85ef177d972
Merge commit 'c368d0c3c2fba3e1f88689f0c59f9c3ab0ab99fd' as 'github.com/dynport/dockland'
Squashed 'github.com/ehazlett/shipyard/' content from commit cceb442

git-subtree-dir: github.com/ehazlett/shipyard
git-subtree-split: cceb44290bb21d71e45dd0edb5cbfb5b62806f00
Merge commit 'f01a53d5235271468203ceeef3da0003b6b082cb' as 'github.com/ehazlett/shipyard'
Squashed 'github.com/fsouza/go-dockerclient/' changes from ae18f77..2dbbb03

2dbbb03 testing: add naive implementation for inspectContainer
6363e9b travis: use install instead of before_script
d76deb0 travis: running all tests
8191378 testing: add naive implementation for commitContainer
98c4da8 testing: add method URL
12d2abb testing: add DockerServer.Stop
e329931 testing: implement NewServer
fa3f201 testing/server: draft the public API
dc010cc testing: starting to build package
78954b3 misc: add Info
c2122ca client: rollback to api version 1.1
e6522c1 Merge pull request #27 from andrewsmedina/travis-go111
4d00652 travis: updated go to 1.1.1.
d5c314c Merge pull request #26 from andrewsmedina/vimfiles
5006544 ignoring vim swap files.
d9d9d49 container: use non-pointer options everywhere
159e1e2 Merge pull request #25 from andrewsmedina/commit
11ea611 client: improve Error type
cb0f8cb commit: refactored to options not be a pointer.
68eee28 misc: add docs for the method Version
1dc4e52 misc: add Version
9f3cd91 client: rename apiClientError to Error
31e4aab container: finish AttachToCotainer implementation
1172e40 client: remove some old code (syncing with docker master)
972e3b3 container: reject empty containers in AttachToContainer
6b171c7 client: fix some golint warnings
d57cff0 container: fix docs for AttachToContainer
fa8f705 client: use a string instead of a float for api version
17deb82 client: use api v1.2
2bbab67 container: starting to implement AttachToContainer
6b64c51 client: import hijack from dotcloud/docker
6fc38d2 client: rename isValid to parseEndpoint

git-subtree-dir: github.com/fsouza/go-dockerclient
git-subtree-split: 2dbbb039dee1b2f904f0ff43840414f4f288c2e3
Merge commit '0e73b7b8b1e1390a2e7560188bf16782570085f3'
Squashed 'github.com/globocom/docker-cluster/' changes from 2dc63ad..7239ecd

7239ecd container: implemented CommitContainer.
8b69bf7 container: improve error handling in runOnNodes
6ce3c7d container: don't use pointer options in ListContainers
85cdab9 ignoring vim swap files.
91fa696 updated contributors.
c73740d container: add AttachToContainer
5023238 travis: updated go version.

git-subtree-dir: github.com/globocom/docker-cluster
git-subtree-split: 7239ecdb846a3c4af16bb9560b6ac8f9ae8573bf
Merge commit 'bc69251ab71780704752c14d66191ddc5a6d677d'
Squashed 'github.com/globocom/tsuru/' changes from e688dd3..863a439

863a439 docs/install/client: fix sphinx warning
aa6d7d4 docker: simplified some tests.
94da7f9 docker: using cluster for inspect.
71c25d7 docs/install/client: fix text in the build from source
efbab8d api: require tsuru 0.8.2
4ba7224 cmd/tsuru: version 0.8.2
303999d docker: using cluster for container.commit.
70490bf docker: using cluster.
dc4a395 change the way to check services
7d22589 docker: running the deploy cmd with de ssh specified user.
07e00ab docker: added logs in deploy.
f931524 docker: added container logs method.
ede2cd4 removing 'check-test-services' before 'test' due 'nc' malfunction on linux make execution
bdfead2 adding a function to reduce code repetition
7e5bd42 make: removed check tests before test.
fbb75c5 docker: added stubs.
931f5bb docker: waiting the deploy container be stopped.
bc330f1 docker: added container.stopped method.
221ff86 checking test services
58bda4e docker: removed container.attach.
12add4b docker: go vet.
26824ef docker: removed errs channel from collect data.
7ee50af docker: attatching ot container on deploy.
2130ed1 docker: attaching the container on start.
f953ac2 docker: added attach method.
51b3fd3 docs/why: s/Golang/Go
03f44b5 docs/apps/quickstart.rst: linking CLI usage
d210e18 provision/docker: improve a little further the error reporting on runCmd
9a7c5c6 provision/docker: improve error recording
4774a21 provision/docker: improve error reporting in runCmd
c5de8ff fixed tests.
72ef844 travis: update go to 1.1.1.
9a3b5d7 docker: added some logs for collect method.
cb40508 docs/why: small text improvements
74f6f05 docs/why: moving links to Juju, LXC and Docker on first paragraph
58c04b5 docker: updated container status to running on start.
12f45a6 docker: removed start in provision.
4e75ef7 docs/apps/deployment: improving document description
0609556 docs/apps/deployment: adding procfile on topics
59bb0a8 docker: fixed runCmds.
ec89382 docker: importing bytes.
3337dcf docker: added restart.
4d2ef2a docker: removed restart logic.
1cfde96 docs/why: removing nonsense piece outside of link text
a4a141a docs/why: Adding sections on server installation and platform and services creation
d3daaac docker: fixed the runCmd.

git-subtree-dir: github.com/globocom/tsuru
git-subtree-split: 863a4394da8bcd912696454e357b7c66037de6d9
Merge commit 'efafd36f30a7e130f96025c2a6111218f749ffde'
Squashed 'github.com/progrium/buildstep/' changes from 7853644..f4d4de8

f4d4de8 Merge pull request #3 from rnorth/master
792944b Play! framework (v1.x) tested successfully with https://github.com/heroku/template-java-play
f61baf0 this is really needed
8d80c3b indent docker pull
fc1040c whoops, this does need to happen after buildpacks
47d6db9 these are already in the base image
9f1fea6 path stuff
0599e92 moved container-build to build.sh, Makefile is just a thin wrapper. renamed build-dir to stack. contents are still placed in /build inside container, but this may change to /stack in the near future
f1321bd some fixes after running
9213e7f simpler and more transparent container build process
d14b88b bad package from cedar
943c891 prepare script now loads buildpacks. packages are now in a separate file

git-subtree-dir: github.com/progrium/buildstep
git-subtree-split: f4d4de8eb0484cb2596e610cea837e5d7af476b1