Squashed 'github.com/crosbymichael/dockerui/' changes from d17adc0..31ac4ec

31ac4ec Merge pull request #7 from crosbymichael/dev
b3023e7 Refactor dockerui.go

git-subtree-dir: github.com/crosbymichael/dockerui
git-subtree-split: 31ac4ec91d3ed1c0a93e74ebeb778ce44230a0e5
Merge commit '65c6460bf0d298adfcd7afd110070826a2a2a3fd'
Squashed 'github.com/dotcloud/docker-registry/' changes from 54d3fb7..f8723f8

f8723f8 Merge pull request #74 from anapsix/debian-init
2d5efd9 DEBIAN Init: added root check, author and fixes for reload/restart
407eda6 CONTRIB: Debian INIT script
71d1375 NGINX: cranking up client_max_body_size to 800MB

git-subtree-dir: github.com/dotcloud/docker-registry
git-subtree-split: f8723f881e0e1bd5d8a506a1b1bf3c04c78a267d
Merge commit '929b5d8624797cbc529e8b431ff836687ebfca2e'
Squashed 'github.com/dotcloud/docker/' changes from e893968..2f24b9e

2f24b9e Merge pull request #1884 from dotcloud/update-vendored-deps
a63cfe7 Merge pull request #1847 from dotcloud/test-docker-in-docker
cd289cc clarify "use"
894eff6 Merge pull request #1880 from getvictor/patch-api
71e15d1 Merge pull request #1881 from dotcloud/ubuntu-install-instructions
74daecc Change apt source to http
102522b Fixing LxcConf example in docker_remote_api_v1.4.rst
b3cbf42 Fixed LxcConf example for docker_remote_api_v1.5.rst
3397262 Merge pull request #1848 from dotcloud/build-clean
4234fc6 Merge pull request #1716 from eliasp/fixme
4a707a8 Add go.net to vendored dependencies
b986fd0 Merge pull request #1846 from dotcloud/fix_return_error
f368fd9 Merge pull request #1862 from dotcloud/dockerfile-multiline-space
6c1c404 Updated vendored dependencies
ffc8502 Merge pull request #1741 from griff/1737_fix_volume_uid_gid
8362367 Merge pull request #1593 from kyleconroy/master
46f644c Merge pull request #1865 from lgp171188/patch-1
1bc2ab0 Merge pull request #1859 from Bachmann1234/patch-1
1d935c6 Update docker.bash script for build -rm
b7a3fc6 Add rm option to docker build to remove intermediate containers
718b1f9 Fixed a minor typo
45cedef hack/vendor.sh: overwrite existing dependencies and remove .git so they can be checked in
1e723bc Replace multiline with empty string not space
9dd98df Merge branch 'master' of https://github.com/dotcloud/docker
557e3ec Merge pull request #1851 from metalivedev/1601-ec2install
dfe45e1 Update hello_world.rst
d5480fb Merge pull request #1857 from shin-/master
c6dc90c Fixed push bug
02037a9 Merge pull request #1726 from dsissitka/1615-2
71d46ea Fixed a bug I created when rebasing.
f4ba0d4 Replaced leading spaces with tabs. Again.
d48ea32 Updated postContainersCreate to use writeJSON.
33e4d73 Replaced leading spaces with tabs.
07324a3 Rebased.
dd49cc4 Added a status code argument to writeJSON.
21be3b7 Fix #1601 with vagrantless installation instructions.
9cfbaec Transfer uid and gid to volume. Fixes #1737.
ebee8f2 hack/make.sh print a warning but don't exit if called outside a correct build environment.
03e36ca Fix typo and add dependency details in hack/PACKAGERS.md
c75926b Fix #1845 lxc typo in images
bd0e4fd Merge pull request #1838 from jmcvetta/multiline_dockerfile
de75241 Merge pull request #1835 from metalivedev/1821-exampleslanding
228b7af Remove fixed FIXMEs
d14058b Update usage comments in hack/make.sh
5b361f3 Packager's manual: official build vs distro build
c24c5c3 Merge branch 'master' of https://github.com/dotcloud/docker
44d0f94 fix wrong return error
b7826f5 add Brian Olsen to AUTHORS
27ca0c2 Merge branch '1582_fix_volume_content' of https://github.com/griff/docker into griff-1582_fix_volume_content
ad152ef Merge pull request #1759 from bdon/graph-map
14bbbcd PACKAGERS.md: a guide to packaging Docker for your favorite distro
3d39336 Break down hack/make.sh into small scripts, one per 'bundle': test, binary, ubuntu etc.
6a4afb7 stricter regexp for Dockerfile line continuations
c01f6df Test dockerfile with line containing literal "\n"
4f3b803 cruft removal
ebb934c line continuation regex
6921ca4 read Dockerfile into memory before parsing, to facilitate regexp preprocessing
59856a2 Add the output of the tests to each release
b187cc4 Integrate unit tests into hack/make.sh
672f1e0 failing test case for multiline command in dockerfile
6678a26 gofmt
e37dcd7 Hack: use vendored dependencies in-place, for less moving parts when developing
fe99e51 Created a little landing page for the examples, combined first two.
4cd59b9 Hack: we no longer need to generate test binaries.
055bbb7 vendor.sh can cleanly update vendored dependencies
19dc3b0 gitignore: ignore bundles directory
20d24a4 move deps installation to vendor.sh script
d757bd0 Document using the Dockerfile for interactive dev/test cycles
4783805 Hack: improve the Dockerfile for an easier development workflow. Build dev container once, run a shell with source mount-binded, run tests as you edit. LIKE A BOSS.
fa806f2 Add usage instructions to the Dockerfile. Build, test and release docker using docker.
34eab42 Adapt Dockerfile to run docker tests inside docker
3c80bd7 Adapt the original dind script and add a description
c983023 Copy dind wrapper script from github.com/jpetazzo/dind
113bb39 Don't export Graph.walkAll.
1fca99a Replace Graph.All with Graph.Map
7a9c711 Copies content from image to volumne if non-empty. Fixes #1582.
6756e78 Just fixing gofmt issues in other people's code.
f6b56e9 Updated "POST /containers/create" to return the right Content-Type.
a359e52 Added FIXME for iproute → netlink as advised in issue #925.
9a60f36 Merge branch 'master' of https://github.com/dotcloud/docker
e9a1246 Enable mobile view for website.

git-subtree-dir: github.com/dotcloud/docker
git-subtree-split: 2f24b9e05c88941d4bcb41c67a7f4ca3ab02a839
Merge commit 'e479785e4829bee0a07964d9d75f58e2556b84dd'
Squashed 'github.com/ehazlett/shipyard/' changes from 7e3ea38..8277817

8277817 removed dev vagrant config

git-subtree-dir: github.com/ehazlett/shipyard
git-subtree-split: 82778172c3a5a5dec7a0c0fac247b2825695761d
Merge commit '4ad8dfec193bbafa5ad88d2570d6469caabda648'
Squashed 'github.com/fsouza/go-dockerclient/' changes from 586a391..c412293

c412293 container_test: adding port spec on json returned by ListContainers
3de5845 testing/server: updatig function name

git-subtree-dir: github.com/fsouza/go-dockerclient
git-subtree-split: c412293b8f55f6a5e6d4677e9ff94600c4edd354
Merge commit '1b5dc4e3abddecd4deb07087ccff41259d95d547'
Squashed 'github.com/fujin/dockerfiles/' changes from c0108a7..ba8cce1

ba8cce1 ceres: add rudimentary install for docker build

git-subtree-dir: github.com/fujin/dockerfiles
git-subtree-split: ba8cce1528dd4f908a80a2b1bea5618ff9ce7fc9
Merge commit 'bcb67ec515daa45cb147c0f64c584cf70e651264'
Squashed 'github.com/globocom/tsuru/' changes from a5b4686..b7bf418

b7bf418 fix some typos
19a5ae3 fix the crane session
e3e0dbf adding a link for howto install a service, and remove the git archive workaround from the kernel building session as it was fixed in the repository
166ba40 fix some bad formatting
7a5c08e fix some bad formatting
6f5c5fd fix some bad formatting
99cab21 fixing the mariadb ubuntu installation part
6154f73 adding a better explained example of how to install a service
fe1aaae heal/caller_test: initializing tsuru log instead of syslog
ddfee78 cmd/tsr/main: registering healer command
c963e5b heal/caller.go: s/Info/Print
dacf999 cmd/tsr/healer: using tsuru log instead of syslog
77d660d cmd/tsr/healer: created healer command
d9673af app: call restart:before and restart:after on Restart
e0a9e54 app: set config to non-nil when there are no hooks in the yaml
c19bd94 moving code from tsuru-healer project to heal package
8bf584c Merge branch 'master' of github.com:globocom/tsuru
a6201f4 updating the building steps
85e8a5d app: starting to implement new hooks model
03a5d9a provision/docker/docker.go: running Flatten with goroutine in build time
227d129 provision/docker/flatten: refactoring function that checks whether an app needs flattening
9587b55 provision/docker/provisioner.go: calling build instead of deploy
3927142 provision/docker: added build method
aef2821 provision/docker/flatten: using provision.App interface instead of app.App
270f1c0 provision/provision.go: adding GetDeploys method to App interface
0c82a85 testing/provisioner: adding GetDeploys method to FakeApp
03513d5 app/app: implementing get method to Deploy field
19e0121 provision/docker/flatten: making flatten work for only one app
eae2b5b Also adding new contributor to AUTHORS.
976fba4 Adding new contributor
8688e5f Merge pull request #546 from gustavohenrique/master
655c35e refactoring bash completation script
49b8224 provision/docker/flatten_test.go: moving assert closer to error
def793d provision/docker/flatten_test: spliting SetUpSuite method by responsibility
7f7290b provision/docker/flatten: also removing unflattened image from registry
202dc13 provision/docker/stubs_test: removing debug print
19822aa provision/docker/flatten: initializing buffer and improved some logging
c0a72ee provision/docker/stubs_test: faking output for export endpoint
ab1069d provision/docker: refactor test code
91f273a cmd/tsuru-base: define MaxArgs in service-add
ec7da35 cmd: also support maximum number of arguments
7050a00 provision/docker: fix unreachable code warning
efe13f6 api: simplify createServiceInstance
9533109 service: add method to CreateServiceInstance
2db6099 tsuru-admin/log: sending appname via querystring.
f2e8d93 api/log: getting appname from querystring.
744c95b tsuru-admin: removing logs by app.
f1d6dc5 provision/docker/stubs_test.go: updating ports value on ListContainers json return mock
40a48df db/storage: using Dial without timeout to connect with mongo
06c97bb provision/docker/flatten: fixing tests
1f474d0 provision/docker: removing newImage function from default test suite
ff80987 provision/docker/flatten: starting implementation of Flatten function
d383b90 provision/docker/docker.go: spliting image removal from registry logic from removeImage function

git-subtree-dir: github.com/globocom/tsuru
git-subtree-split: b7bf418bfc5ee77f426530ed7dee06ea26d02522
Merge commit 'fdfaad186a60092545586de9bcc7e60880f96ac1'
Squashed 'github.com/progrium/buildstep/' changes from 44967ea..c30652f

c30652f Merge pull request #35 from CHH/patch-1
f87ae98 Add libjpeg and libpng shared libraries

git-subtree-dir: github.com/progrium/buildstep
git-subtree-split: c30652f59aacbb3c9cee59c8299ece3824ba6ac6
Merge commit 'ec3fbe787f8038efed742b781aed9a34adf213fb'
https://github.com/infoxchange/docker_dns.git
Squashed 'github.com/infoxchange/docker_dns/' content from commit 3d78250

git-subtree-dir: github.com/infoxchange/docker_dns
git-subtree-split: 3d78250c63db32a226a6f05c7e23507fdd713227
Merge commit '07bff43919cc528d3898fad4c0f65850c95c7fd9' as 'github.com/infoxchange/docker_dns'
projects.txt updated