Squashed 'github.com/crosbymichael/dockerui/' changes from e5dab43..f2b849f

f2b849f Merge branch 'dev'
81b1ee8 Use sys link in dockerfile for app
fbf95ca Do not expose public port
55542e6 Update port examples
5dc53c3 Merge branch 'dev'
9672a33 Update readme with submodule msg
2e1918a Update readme for v02
95662bf Merge branch 'server' into dev
40435f8 Update dockerfile and server for app dir
877effc Add dockerui server files and Dockerfile
38f859f Update build and msg paritals
980bc66 Merge branch 'create-containers' into dev
8aa21dc Add ace builds
be9a883 Merge branch 'batch-actions' into create-containers
4b1eb96 Merge branch 'messages' into batch-actions
2e67fca Add global message display
37ea44a Add message view and controller
dd8c4ce Add size and actions to container view
2d199ee Add container size
b069616 Add batch ops to images
86d7c4d Add spinner for loading times
0f8da44 Add build support for http request
7b7bb46 Add Dockerfile view builder
a7e9209 Add Ace editor
fc01c93 Add builder partial
c4b0a22 Use modal for creating a new container
c337707 Remove masthead active links

git-subtree-dir: github.com/crosbymichael/dockerui
git-subtree-split: f2b849fd85f6ccdae89c72dfe1c8746afc250d5a
Merge commit '7218ca7291c97728bb07bf49be83f2282c32e438'
Squashed 'github.com/dotcloud/docker/' changes from 389db5f..862e223

862e223 Merge branch 'add-daemon-storage-path-param' of https://github.com/heavenlyhash/docker into heavenlyhash-add-daemon-storage-path-param
e1e2ff5 Merge pull request #1018 from nahiluhmot/add-swipely-docker-gem
d03edf1 Added Swipely's `docker-api` gem to the table of Remote API Client Libraries.
ec1dfc5 Merge pull request #992 from unclejack/use_numeric_owner_for_tar
145c622 Merge pull request #990 from dotcloud/fix-tests-cgo
e2516c0 Merge pull request #932 from metalivedev/docs20130614
a3cb18d Merge pull request #1003 from dotcloud/fix_utils_tests
eca9f9c fix regrettion in utils tests introduced by #980
aee8456 Merge pull request #998 from dotcloud/861-hack-vagrant
e3dbe2f Fixing hack/Vagrantfile to use uname for aufs linux extras
193888a Merge pull request #997 from dotcloud/bump_0.4.6
9fe8bfb Bump version to 0.4.6
fc25973 Merge pull request #996 from dotcloud/995-volumes-crash
f9acd60 - Runtime: add regression test for issue #995
290b197 Fix a bug which caused creation of empty images (and volumes) to crash. FIxes #995.
d7d42ff use --numeric-owner for tar and untar
ce9e50f Remove dependency on 'os/user', which cannot be used with CGO_ENABLED=0. This allows running the tests without CGO.
ecd1fff Fix formatting in Changelog
b0f12bd Merge pull request #988 from dotcloud/526-packaging-ubuntu
5d61ec1 Packaging|Ubuntu, issue #526: Follow init permission pattern for docker.conf
c792c0a Merge pull request #986 from dotcloud/bump_0.4.5
d9d2540 Small copy improvements in Changelog
f5d08fc Bump version to 0.4.5
b24759a Merge pull request #959 from dotcloud/947-add_ps_size_option
4d16927 merge master and add doc
1581ed5 consistent codebase fix
de1a5a7 Merge pull request #848 from dotcloud/builder_server-3
169ef21 Remove deprecated INSERT from documentation
d0fa692 Update api docs
63e8a4a Merge pull request #970 from titanous/go1.1-unreachable
459230d Merge pull request #980 from ToothlessGear/fix-progressbar
070e1ae Merge pull request #975 from unclejack/891-mark_command_as_optional
3ac68f1 Client: better progressbar output
5ccde4d Merge pull request #801 from dotcloud/build_docker_static
dc84700 Merge pull request #888 from dotcloud/fix-auth
639833a fix tests
8f2a808 Merge branch 'master' into fix-auth
7884297 Merge pull request #976 from dotcloud/fix_doc_post
8e7d4cd fix doc post
5b3ad00 inverse if
6a1279f docs: mark command as optional for docker run
66910a7 mark command as optional for docker run
d9bce2d - Builder: return an error when the build fails
352991b Merge branch 'simpler-build-upload' (#900) into builder_server-3 (#848)
4383d7b Merge pull request #953 from rhysh/952-swapaccount-docs
89ae568 Merge pull request #965 from freegenie/patch-1
17489ca Merge pull request #972 from titanous/update-authors
c1a5318 Merge branch 'build-add-file' into simpler-build-upload
b0b690c Update AUTHORS
86e8318 Merge branch 'master' into simpler-build-upload
36d610a - Builder: fixed a regression in ADD. Improved regression tests for build behavior.
50b70ee Remove code unreachable using Go 1.1
cc0f597 * Builder: simplified unit tests. The tests are now embedded in the build itself. Yeah baby.
09dd7f1 Merge pull request #969 from dotcloud/fix_logs
b419699 Use hijack for logs instead of stream
08825fa remove unused files
02f0c1e Bump version to 0.4.4
e44f62a Add argument to allow setting base directory for docker daemon's storage to values other than "/var/lib/docker".
dbfb3eb - Builder: hotfix for bug introduced in 3adf9ce04ef1632f82f7bd1585c135bb141aa450
e433232 Merge branch 'master' into simpler-build-upload
da06349 Update README.md
cff2187 Fixed API version numbers in api docs
a078d3c Merge pull request #950 from dotcloud/bump_0.4.3
da5bb4d Bumped version to 0.4.3
1b19939 Merge pull request #946 from unclejack/speed_up_dockerbuilder_image_creation
930e1d8 Merge pull request #941 from dotcloud/makefile_test_subpackages
fa68fe6 Merge pull request #938 from dotcloud/add_unix_socket-feature
21a5a62 Merge pull request #907 from dotcloud/go1.1_cookie_jar-feature
db60337 Makefile: added missing -a option
c5be64f Add link flags in order to link statically and without debug symbols
659e846 Merge branch 'master' into builder_server-3
d8f5635 Merge pull request #961 from dotcloud/933-warning_rm-running
d1a3d02 Merge pull request #913 from dotcloud/fix_detach_eof
8807b7d Merge pull request #909 from dotcloud/fix_auth_tests
cd155a1 Merge pull request #962 from dotcloud/960-packaging-ubuntu
d8887f3 Packaging|ubuntu, issue #960: Add docker PPA staging in release process
1c841d4 add warning when you rm a running container
da19984 use strconv.ParseBool in getBoolParam
bd04d7d add ps -s
5f93aa0 rebase master
05796be update docs
8a131df Merge pull request #948 from dotcloud/registry_pathencode
79efcb5 Merge branch 'master' into simpler-build-upload
88dcba3 Packaging|ubuntu, issue #954: Generate debian/changelog from main CHANGELOG.md
754609a Merge pull request #945 from globalcitizen/master
d6ab71f * Remote API: updated docs for 1.3
55edbcd * Builder: remove duplicate unit test
90dde9b *Builder: warn pre-1.3 clients that they need to upgrade. This breaks semver, but our API should still be in 0.X versioning, in which case semver allows breaking changes.
5fc1329 the kernel needs "swapaccount=1" set - some docs are updated, this one seems to have slipped through
9c8085a Merge pull request #951 from dotcloud/add-fix
507ea75 * Builder: correct the behavior of ADD when copying directories.
7e065aa Merge pull request #917 from dotcloud/pull_pool
0312bbc Use opaque requests when we need to preserve urlencoding in registry requests
a056f1d Merge pull request #924 from eliasp/remove-ifconfig-usage
fdaefe6 Merge pull request #944 from hansent/patch-1
8827943 batch apt-get install operations for speed
2d6a492 add testall rule
a7e14a3 hotfix: nil pointer uppon some registry error
a660cc0 Merge pull request #934 from dotcloud/fix-add-behavior
788d66f Add note about lxc.cap.keep > lxc.cap.drop
96988a3 Add healthy procfs/sysfs warnings
b368d21 Merge branch 'master' into fix-add-behavior
c88b763 use https repo url to clone for dev setup instructions
ec3c89e Merge pull request #849 from dotcloud/improve_progressbar_pull
5dcab2d gofmt and test sub directories in makefile
5f7e98b Merge pull request #930 from andrewmunsell/patch-1
d52af3f Merge branch 'master' into add_unix_socket-feature
063c838 update docs
9632bf2 add tests
dede158 add the possibility to use multiple -H
5be7b9a * Builder: fixed the behavior of ADD to be (mostly) reverse-compatible, predictable and well-documented.
5183399 Added multilayer example image.
a780b7c New Terminology section and illustrations.
0ae778c Merge pull request #788 from samjsharpe/master
1f8b679 Fix Mac OS X installation instructions URL
ee5df76 Merge pull request #885 from dotcloud/remove_bsdtar
b431720 Merge branch 'remove_bsdtar' of https://github.com/dotcloud/docker into remove_bsdtar
42ce688 Fix issue within TestDelete. The archive is now consumed by graph functions
c063fc0 Merge branch 'master' into fix_detach_eof
0a9ac63 Merge pull request #916 from dotcloud/race_attach-fix
6dccdd6 remove offline mode from auth unit tests
34a4346 Merge branch 'master' into builder_server-3
bc9b91e Use the canonical 'ip' commands to make it easier for new 'iproute2' users to understand the usage.
edbd3da Merge pull request #927 from dotcloud/nicer-build-output
32e8f9b Merge pull request #918 from dotcloud/hisotry_lookup
84ceeaa Update documentaiton
cdeaba2 Updated FIXME
c0b82bd Fix incorrect docs for 'docker build'
88e35b6 Merge pull request #926 from josephholsten/fix-znc-example
6e17cc4 Fix merge issue
cb9d0fd Nicer output for 'docker build'
3adf9ce add basic support for unix sockets
c2e9599 Fixed #923 by replacing the usage of 'ifconfig' with 'ip a' where appropriate and added a note to use 'ip a' instead of 'ifconfig' for a screencast transscript.
808faa6 * API: Send all tags on History API call
6f511ac Remove bsdtar dependency in various install scripts
3dc93e3 Remove useless goroutine
e2d034e Remove useless goroutine
8620554 Merge branch 'master' into race_attach-fix
702c353 Merge pull request #921 from dhrp/docs-redirects-and-fixes
069a7c1 Merge pull request #914 from ToothlessGear/fix-version-output
2e7649b Merge pull request #920 from dotcloud/919-packaging
8281a0f Vagrantfile: Add support for VMWare Fusion provider
3491d7d Fixed on documentation.
e664a46 Packaging, issue 919: Bump version to 0.4.2
0809f64 * Builder: upload progress bar
02a002d Update documentation
3bfc822 * API: Add tag lookup to history command. Fixes #882
02c291d Fix bug on compression detection when chunck < 10bytes
b25bcf1 fix docker version git output
fe204e6 - Runtime: Forbid parralel push/pull for a single image/repo. Fixes #311
2b6ca38 Remove Run race condition
c106ed3 Move the attach prevention from server to client
2626d88 fix missing command in irc bouncer example
3a0ffbc - Runtime: Fixes #884 enforce stdout/err sync by merging the stream
bd9bf9b Packaging|dockerbuilder, issue #761: use docker-golang PPA. Add Dockerfile header
7b6f507 Merge pull request #912 from dotcloud/bump_0.4.1
5555523 Merge branch 'master' into builder_server-3
6e2c32e Merge pull request #911 from dotcloud/add_port_redirection_doc
22b0a38 Merge pull request #897 from dotcloud/fix-overlapping-add
cb58e63 Typo
8626598 Added content to port redirect doc
3623134 add port redirection doc
e8f001d Bumped version to 0.4.1
13e03a6 Fix the auth tests and add the offline mode
fde82f4 use go 1.1 cookiejar and revome ResetClient
79b3265 Merge branch 'master' into builder_server-3
fe88b50 Merge branch 'master' into simpler-build-upload
f50e400 * Builder: added a regression test for #895
061f8d1 * Builder: reorganized unit tests for better code reuse, and to test non-empty contexts
38554fc * Builder: simplify the upload of the build context. Simply stream a tarball instead of multipart upload with 4 intermediary buffers. Simpler, less memory usage, less disk usage, and faster.
cc7de8d Removed deprecated file builder_client.go
78f86ea Merge branch 'master' into builder_server-3
5b82876 + Builder: ADD of a local file will detect tar archives and unpack them 	into the container instead of copying them as a regular file.
76a568f Fix merge issue
abf85b2 Merge branch 'master' into remove_bsdtar
60fd7d6 Merge branch 'master' into improve_progressbar_pull
79fe864 Update docs
6f7de49 Add unit tests for tar/untar with multiple compression + detection
90f6bdd update docs, remove config file on 401
9cc72ff fix auth in case you change your password on index.io
2f14dae Add build UT
f03ebc2 Fix issue with ADD
4b4918f Merge branch 'master' into builder_server-3
0425f65 Remove bsdtar by checking magic
f5fe3ce Remove run from non-running commmands
d0084ce Remove run from the ADD instruction
b38c692 Updated build usage
8984aef Fix typo in docs
b103ac7 Allow multiple tab/spaces between instructions and arguments
1e0738f Make the progressbar human readable
f355d33 Make the progressbar take the image size into consideration
2cc22de Update documentation for docker build
12c9b9b Implement build from git
a11e616 Move the docker build URL form client to server, prepare for GIT support
01f446e Allow to docker build URL
f4a4cfd Move isUrl to utils.IsURL
eaa2183 Fix issue EXPOSE override CMD within builder
31d2b25 Allow remote url to be passed to the ADD instruction within the builder

git-subtree-dir: github.com/dotcloud/docker
git-subtree-split: 862e223cecec203a96d3be4fd667bc9286703e82
Merge commit '2a6690f5a7f7d2c9d9d31864d4d891571ed26f2a'
Squashed 'github.com/dotcloud/openstack-docker/' changes from c51261d..082fac0

082fac0 Update nova_blueprint.md
32b0746 Fixed code to work in the Jenkins environment (and pass the unit tests)
4eabccc Added blueprint for OpenStack Nova

git-subtree-dir: github.com/dotcloud/openstack-docker
git-subtree-split: 082fac0c55835a2197eb3fd7756221a98005b487
Merge commit '7123d800ae4888300655ec23990326f42e79ba07'
Squashed 'github.com/ehazlett/shipyard/' changes from cceb442..ea5a474

ea5a474 updated readme
b70a620 updatd readme
efbd101 Merge branch 'dockerfile'
6656eb3 added private containers ; builder
d4d3b55 updated settings
a3b0fd6 added private containers
068b8f2 Merge branch 'meta-data'
50c10a0 added metatdata to containers ; fixed initial setup bug
86e07f2 added search / import for repositories
58c47d8 updated readme with port setting instructions (thx vieux from #docker)
9be76bc updated readme
5545683 updated readme
75bf4f4 added ability to specify environment vars on container creation
9238d62 added links for container ports

git-subtree-dir: github.com/ehazlett/shipyard
git-subtree-split: ea5a4749d401f2b8791d4547d0d54ea720bb4b52
Merge commit 'e68f6293d1d80da22a8cf6b9b877861b26a45fef'
Squashed 'github.com/fsouza/go-dockerclient/' changes from 2dbbb03..cfd656d

cfd656d image: fix documentation
eb8ab6c container: add "Size" parameter to ListContainerOptions
5e2a9ba testing: implemented remove image.
4db3404 testing: implemented list images.
f519b10 testing: added findImage.
95625e7 readme: fix link to docker API docs
00c9424 travis: use go get -d to just download dependencies
692885d testing: fix test
1a6d807 testing: also reset Container.Created
230ee89 testing: increase test reliability
3a7c82e all: s/a image/an image/
25e7bfd testing: add waitContainer
eebc02d testing/server: protecting changes to container.State.Running
10ceba5 testing/server: nitpick in DockerServer docs
af92b22 container: fixed the list endpoint uri.
760dd2f testing: fixed pull image behaviour.
8cd421b testing: add stopContainer
9e7efcf testing: add removeContainer
54c3411 testing: return bad request for startContainer on running containers
368854b testing: add attachContainer
0530cc3 testing: remove fmt.Println
ad33439 testing/server: added suport for pull image repository.
1b6c569 docker: implemented pull image.
9cd55e5 testing: improve error reporting
7b83227 testing/server: add startContainer
6e77033 testing/server: don't set Running to true on createContainer
1cd6e63 testing/server: finish commitContainer implementation
c4790d0 testing/server: improve commit implementation
d3e801b testing/server: use actual implementation for inspectContainer
ecf6ebf testing/server: move commitContainer
ac4c8c3 testing/server: add createContainer
5aee8b9 testing/server: reduce mutex contention
1bd939e testing/server: add listContainers method
9ca5036 testing: don't start DockerServer in tests

git-subtree-dir: github.com/fsouza/go-dockerclient
git-subtree-split: cfd656ddcba09a02d4270306d57002a30451ec55
Merge commit '44d2276c517e4f2f96682678fcaf264ea835e3e3'
Squashed 'github.com/globocom/docker-cluster/' changes from 7239ecd..dcfe616

dcfe616 fixed error on commit.
02467b6 cluster/image: add tests for failure in (Pull|Push)Image
9480e88 cluster: fix bug in runOnNodes
b7f62af cluster/image: add PushImage
00fd46d cluster/image: add PullImage
60937c1 contributors: readd banner explaining the file
6699f08 cluster: add test to make sure that RemoveImage returns proper error
7aa2510 cluster/image: add RemoveImage
e6127a2 cluster: generalize and move runOnNodes

git-subtree-dir: github.com/globocom/docker-cluster
git-subtree-split: dcfe616b5d5d9dec048a0c901784926d1b0af930
Merge commit 'c71f487b58d565a5111af50c8db8e9bb167fac56'
Squashed 'github.com/globocom/tsuru/' changes from 863a439..12a8553

12a8553 docker: added user in deploy commands.
2642e1c docker: added user on start commands.
b05914e docker: removed user.
6f9fbd0 docker: added logs.
ede9ed1 docker: added start container on start.
47b39eb docker: starting container on deploy.
b017f40 docker: added action for start container.
d47ee8c docker: comment logs.
5277317 docker: added logs after commit.
219dd6e docker: added logs on commit.
342ad22 docker: added more logs on deploy.
795589e docker: added logs on container.logs.
1644153 docker: added more logs on deploy.
18b3139 docker: added more logs for deploy.
2fa5de8 docker: fixed race condition problem with dockerCluster.
ec98b54 docker: refactored getDockerCluster.
6dbb909 docker: added more logs for deploy pipeline.
6e0c3e5 docker: added more logs for create container.
d56fef9 docker: added logs in new container.
2721735 go vet.
01650e4 action: added log on error.
93d897d docker: removed container.create.
e53ccbe docker: refactored new container.
71d2392 docker: using pipeline in start container.
bc42d06 docker: returning container in add route.
c62a1f8 docker: added port in create container action.
265aaeb docker: fixed bwcontext.
60adf45 docker: using pipeline for deploy.
3a1079c actions: added Result for pipeline.
576cc23 docker: improved create container action to receive app.
ed64e8d docker: fixed setIp test.
84e9332 docker: added forward for set host port.
9677b0a docker: fixed test name.
cf829cf docker: added action to set host port.
a4d5d14 docker: added test for set ip action name.
1ef65f5 docker: added forward for set ip action.
cd71a94 docker: added forward for add route action.
f0e3596 docker: added action for add route.
4345193 etc/tsuru-docker: add registry setting
3bd1510 docker: igoring errors for ip or host on create.
874a0ea docker: added forward for insert container action.
72d53be docker: added backward for create container action.
280f23b docker: added defer to remove container.
83c4b24 docker: added forward for create container.
ff636ea docker: added initial createContainer action.
a61a4f1 etc/docker: added a config for servers in sample conf.
4097d37 docker: reading info about docker servers from config.
adf4db9 docker: added a test for docker cluster.
50aa16d docker: igoring errors when ip or port is none.
3e1ba1d docker: added confs to disable the attach mode.
5251c5b docker: removed conf for docker bin.
2b12bc0 docker: using cluster for remove image.
3a10a71 docker: removed binary.
b001d11 docker: added imageid parameter in create.
4351533 docker: added image parameter in newContainer.
20bf8c6 docker: removed imageId from runCmds.
27230ee docker: fixed tests.
094ec53 docker: removed docker params from run cmds.
b20c9cb docker: removed image from run cmds.
eaeb3d5 docker: removed docker params from deploy cmds.
7d3a0d5 docker: removed image param from deploy cmds.
e9a486d docker: remove user params from deploy cmds.
a1fd50f docker: added user for container create.
d2361fd docker: removed port params from run cmds.
f53a61a docker: removed port params from deployCmds.
b993a1d docker: using cluster to get logs.
7d56e8b docker: using cluster to create containers.
84f7ebe provision/docker: use time.Sleep as temporary solution for a race
9f2e951 provision/docker: log failures SerializeEnvVars
d0430cf provision/docker: use GetCommands to avoid data race
630f6b2 testing: use mutex to protect access to FakeApp.Commands
73c2fbe provision/docker: serialize environment variables after Deployment
099f7bd app: export SerializeEnvVars
736402a testing: add SerializeEnvVars to FakeApp
0443b5e provision: add SerializeEnvVars method to the App interface
bb802d2 misc/check-contributors: ignore local user
c751727 provision/docker: don't enqueue apprc regenartion on Deploy
578833f docker: removing prints.
13040aa docker: fixed tests.
0c81f24 fs/testing: accept rename on nil map
37ee9ea fs/testing: don't check whether the file exist or not in Rename
3803f29 fs/testing: implement Rename in the RecordingFs
0836810 fs: simplify methods declaration in OsFs
8bfa3cd fs: add method Rename to the Fs interface
f099fd3 docker: using fake server for test container commit.
94654cb docker: using fake server for test container stopped.
e74f2c7 docker: using cluster for remove containers.
02e52d7 misc/insert-platforms: fix typo
3b1e4ae misc/docker-setup: fix docker installation
edff320 misc/insert-platforms: add license banner and usage
b1314f2 misc: add script to insert platforms in the database

git-subtree-dir: github.com/globocom/tsuru
git-subtree-split: 12a855378a19d11fa803a244699c4d56a0c94f52
Merge commit '4c246d8fa90abaf685b82b6886a329e971d1c0f7'
Squashed 'github.com/portertech/kitchen-docker/' changes from be49379..0cc1836

0cc1836 Merge pull request #7 from gregf/install_lsb-release
8012a24 Make sure we have lsb-release installed on debian systems.
1c806d5 driver version bump
3305c9f driver config option to remove images, default to false, faster builds
a1d5b8f specify host (public) ports for forward mappings
ecc1db3 Merge pull request #6 from gregf/update-testkitchen-dependency
afeaaf8 driver version bump
142f05b fixed rm container, need to stop a running container first
405aaec Update test-kitchen dependency to 1.0.0.alpha7
8e2ac8a fixed ip address parsing, IpAddress -> IPAddress :/
038fd2e fixed container ip parsing, inspect returns an array in newer versions
51f7364 fixed image id parsing, multiple versions of docker

git-subtree-dir: github.com/portertech/kitchen-docker
git-subtree-split: 0cc1836ea6f11d4101e5c438fc2a1250fc5d7da2
Merge commit 'd7bdf02409155ceee4ae7cf6b14d989bfdc932ce'
Squashed 'github.com/progrium/buildstep/' changes from f4d4de8..b93f3f8

b93f3f8 Merge pull request #7 from lukec/master
d31801e add myself to AUTHORS
0c55171 Merge pull request #5 from lukec/master
5687fa5 Add the Perl buildpack
a47e40e fix typo
7b0d89f updated README, added info about PHP and Go support
f3ff337 added support for Go buildpack
b38a0ef added php buildpack
274fc22 creates .profile.d folder in build_root
9c25f90 upload script
73f59b9 list currently supported buildpacks
045fe5a added myself (Felipe Coury) to AUTHORS
2387e13 Merge pull request #4 from fcoury/fix_build_dir
9e3439c improves compatibility with Heroku build process

git-subtree-dir: github.com/progrium/buildstep
git-subtree-split: b93f3f843b8deb9bcf442785f6741f57d4485e04
Merge commit '0c4dd9deb0c8e2c95239e242d822c0e51c3b3b4b'
Squashed 'github.com/progrium/dokku/' changes from 3e62268..b15b55f

b15b55f outputting result from curl for deploy debugging
964299d disabling go app since it is broken atm
02fa553 include app name in repo name
5f1d2c4 remove debug output
0f230c3 actually copy hidden/dot files. needed for .godir in go app
ef7ac5b moving test apps into place with proper check_deploy scripts
67c727a testing failure
5af2055 moving around set -e to see if that changes anything
daebad9 should have used ssh-keygen
2865154 output key before uploading to inspect it
2f74fc9 try and figure out why it silently fails
7da64d7 capture stderr to show errors on failure
1184dc3 make sure keys are uploaded correctly
4bd8331 ugh, that line wasn't even necessary
c5ebc4a ensuring git is configured
8a884f0 using proper template Xs
7fd8f4e a travis script, since its getting a little complex
5fab0a4 fixing file permissions for ssh identity
e94a9a4 use test private key identity
9d56c54 seriously, a typo in my own name...
9d1f04a secret key has slashes in it, so need a different delimiter
c3c2071 proper quotes for variables to be used
93f8c5c point to .s3cfg in current path
4ece03a fixes unterminated s command
79c3c5b sudo for apt-get on travis
946973b first pass at fully functional test infrastructure to work with travis ci
3a6d2c4 exec bit
7a1b4be debug mode and better waiting for ssh
4bb66c6 some fixes and improvements to bootstrap
6244d81 temporarily requiring name of app as argument
0cfdcb6 use sshcommand to create dokku command user
6525b87 will travis like this?
69c502a Merge branch 'master' of https://github.com/progrium/dokku
bff5342 travis ci experiment
92f395d Merge pull request #42 from rhy-jot/master
49ce9aa Run as superuser where appropriate, and fix up an example.
dab5b79 Merge pull request #41 from rnorth/auto_restart
e295c46 Making docker automatically restart previously running containers
5855c75 dropping ruby dependency and cleaning up a simple if statement
5fd7ac4 replacing ruby json parsing
c3aa085 Merge pull request #38 from fcoury/nginx_config
47c6b87 added myself to AUTHORS
c058c17 enables server_names_hash_bucket_size in nginx
bc82847 Merge pull request #34 from silasb/add-my-self-to-authors
f25c9eb Merge pull request #37 from fcoury/bootstrapping
1f175f7 installs docker 0.4.2 instead of the latest available
d7a77ed bumped buildstep submodule dependency to latest master
79a0bc0 Merge pull request #21 from unclejack/fix_bootstrap_script
f97fbef Added myself to AUTHORS
c8baad6 add curl to the list of packages to be installed
4634bf6 install kernel & python-software-properties separately
8aad633 Merge pull request #32 from kornnflake/upstream3
1ca9e05 Add myself to authors
47aad38 Merge pull request #31 from fcoury/test_apps
fa9757b added python test app
f9ffc72 added php test app
b31ef35 added go test app
e16be60 Merge pull request #30 from rhy-jot/master
3a724ba Add myself to authors
c6ed385 Merge pull request #29 from rhy-jot/master
de78434 Use HTTPS for DOKKU_STACK and BOX_URI
7fd0d79 Merge pull request #26 from frio/master
d690c5d Merge pull request #25 from kornnflake/upstream1
f9d594b Explicitly installs dnsutils when bootstrapping
19c69a2 Run bootstrap.sh as super user
bc29aea english is harder than code
a22c55a updated mention of supported buildpacks and link to more
8b7c8ad helpful links
e5ba03e the responsible thing to do
4674e83 Merge pull request #16 from silasb/master
6035737 Root is element is an array not a hash
a2ee3d0 download builstep container (aka the stack) by default. it will be fast now

git-subtree-dir: github.com/progrium/dokku
git-subtree-split: b15b55f4af51620d30cb0d10c49513072d55a392
Merge commit '0e2a6e62b05f42a1775d9a2c8f1f74221e4bb7c7'