https://github.com/rainforestapp/Docker-Terminal.git
Squashed 'github.com/rainforestapp/Docker-Terminal/' content from commit ea2dd9b

git-subtree-dir: github.com/rainforestapp/Docker-Terminal
git-subtree-split: ea2dd9b400e88666ec9765383d9330a51110e429
Merge commit '9483e1f51f551ce671cf2fce6eae5972da95ca8e' as 'github.com/rainforestapp/Docker-Terminal'
Merge commit '33341d2a538c2c76c5ca73ea0f665886b778b67c'
Squashed 'github.com/aschmidt75/haproxy-docker-config/' changes from 5ceccf1..5740e5f

5740e5f indent/formatting

git-subtree-dir: github.com/aschmidt75/haproxy-docker-config
git-subtree-split: 5740e5fdcc7199d876c8744382a7532a534ca293
Squashed 'github.com/dotcloud/docker-registry/' changes from 8ff4145..9a17c2d

9a17c2d Added missing module checksums
197dc32 Implemented tarsum checksum type
a9fccc5 Bumped version to 0.5.2
e1cd7d3 Merge pull request #20 from ooyala/master
1361503 fix update_index_images
ad14a7b Implemented "/images/IMAGE_ID/checksum" endpoint in order to set the layer checksum at different stage of the image upload
4e8257a Renamed test_workflow.py (functional test) to prevent auto-execution when running unittest discover
8afeaf2 Fixed search response
3049c9e Added another endpoint for ping
c1d8a96 Merge branch 'master' of github.com:dotcloud/docker-registry
eaef7ee Fixed pep8 indent
71f9e78 Implemented version signature (header)
61db952 Merge pull request #19 from ekarlso/master
50017d4 Upstart file for Ubuntu and others
7826ac4 Documented the example configuration file
cf2506a Standalone mode is now the default
7f37bd4 Fixed return code for Index /images route
5be2564 Merged encode_repository_name and parse_repository_name helpers
66a6524 Added decorator to encode repository names
87d9ef0 Stripped line (flake8 complained)
3ec7ea7 Removed blank lines to be consistent with the rest
d963351 Merge pull request #18 from kencochrane/master
fa7b18e added some debugging statements and added a fix for checking tokens for source push/pull/delete
bf1adf4 merge
73e1d23 Fixed test debug data + URL routing issues
1026a87 renaming DELETE call on a repos
1f51519 Manually patch applied from pull request #16 (cannot rebase automatically)
0ba4c7c Code cleaning: PEP8 compliant
940be6f Merge branch 'pr-17'
01b8221 Implemented unit tests for the Index module + fixed few bugs
9173479 Factorised most of the routes + general code refactoring
af21b61 Reworked storage path helper. Removed DELETE repos because it is already handled by the tags module
5f43748 Fake Index module can now be loaded according to a configuration directive named standalone
47eed05 Code cleaning in order to make the index module more consistent with the rest of the code base (indent, 80 columns, etc...)
c5e78c5 added path: to the tag urls so that it will work with the new source push/pulls
82cfd0b add index routes

git-subtree-dir: github.com/dotcloud/docker-registry
git-subtree-split: 9a17c2d38952e144845b07ed79a33e00ea525051
Merge commit 'd5247bbee5e4dae166415b4049374685b6677976'
Squashed 'github.com/dotcloud/docker/' changes from 862e223..9b57f91

9b57f91 Merge pull request #1200 from ToothlessGear/fix-whitespaces_progessbar
50e45b4 Merge pull request #1190 from dotcloud/1189-add_debug_error
2051ebc Merge pull request #1198 from dotcloud/fix_pull_tag
933b9d4 Merge pull request #1054 from nickstenning/getimage-by-tag
44b3e8d Reverse priority of tag lookup in TagStore.GetImage
9bf8ad7 Merge pull request #1083 from hukeli/debian
9913ebb Merge pull request #1203 from dotcloud/1202-packaging-debian
c7a48e9 Packaging, issue #1202: Upgrade vagrantfile go in debian packaging
2cbf220 Merge pull request #1195 from dotcloud/tests-cleanup
bac5772 *Client: Fix the progressbar, without manipulating other outputs
a6e5a39 Revert "Client: better progressbar output"
cd0fef6 Fixed tag option for "docker pull" (the option was ignored)
8e6c249 Merge pull request #1197 from crosbymichael/buildfile-doc-ordering
752f99e Merge pull request #977 from dotcloud/966-improve_docker_login_parameters-feature
a909223 Merge pull request #1102 from dotcloud/1098-store_hostconfig_tmp
8ff271f Merge pull request #1192 from dotcloud/docker_port-fix
9dfac1d Merge pull request #1055 from dotcloud/list_container_processes-feature
a8a6848 fix tests regarding the new test image
9232d1e Merge branch 'master' into list_container_processes-feature
90483dc Fix Docker Builder documentation numbering
6bdb6f2 Simplify unit tests code with mkRuntime()
2ac1141 Don't leave broken, commented out tests lying around.
71d2ff4 Hotfix: check the length of entrypoint before comparing.
637eceb Merge pull request #1124 from crosbymichael/buildfile-volumes
976428f change output
affe7ca fix broken docker port
b7937e2 add debug for error in the server
5a411fa Make the TestAllocate{UDP,TCP}PortLocalhost more reliable
3363cd5 Merge pull request #1178 from dotcloud/fix-dev-environment
5c49a61 Merge pull request #1183 from dotcloud/960-packaging-PPA
f83c31e Packaging, issue #960: Document PUBLISH_PPA for staging/production release
8f36467 Raise the timeouts for the TCP/UDP localhost proxy tests
8e49cb4 Merge pull request #1181 from dotcloud/export_portmapping
40f1e4e Rebased changes buildfile_test
1267e15 Add unittest for volume config verification
eb9fef2 Add VOLUME instruction to buildfile
43b346d Merge pull request #1151 from alex/patch-1
d918c7d export portmapping in network.go
e962e9e Merge pull request #1168 from dotcloud/standalone_registry
b7a62f1 Merge pull request #1177 from lopter/udp-support-final
2e5d1a2 Merge pull request #1164 from dotcloud/1162-import_hangs-fix
fac0d87 Add support for UDP (closes #33)
a839b36 Fix outdated docs explaining how to setup a dev environment. Building docker with docker ftw
316c832 Hardened repos name validation
e8db031 Fixed tag parsing when the repos name contains both a port and a tag
59b785a Fixing missing tag field when pulling containers which does not exist
1a1daca Fix a typo in runtime_test.go: Availalble -> Available
837be91 Merge branch 'master' of github.com:dotcloud/docker into standalone_registry
f44eac4 Fixed potential security issue (never try http on official index when polling the endpoint). Also fixed local repos name when pulling index.docker.io/foo/bar
0acdef4 Merge pull request #1166 from dotcloud/networkless_tests-2
7d8ef90 Merge pull request #1173 from dotcloud/1172-ghost_restart-fix
9152083 Make sure container is not marked as ghost when it starts
ada0e1f Merge pull request #1049 from dotcloud/1040_ignore_stderr_tests-fix
33d97e8 Removed DOCKER_INDEX_URL
0193240 Moved parseRepositoryTag to the utils package
72d278f Merge pull request #1170 from dotcloud/fix_type_socket
05d7f85 fix typo
7fba358 Merge pull request #1013 from dotcloud/standardize-build
9f1fc40 * Hack: standardized docker's build environment in a Dockerfile
3be7bc3 Fixed typo (thanks unit tests)
31c66d5 Re-implemented a notion of local and private repos. This allows to consider the full qualified name of the repos as the name for the local repository without breaking the calls to the Registry API.
e7d36c9 It is now possible to include a ":" in a local repository name (it will not be the case for a remote name). This adds support for full qualified repository name in order to support private registry server
3e8626c Changed the tag parsing to it will work even if there is a port in the repos registry url (full qualified name for pushing on a standalone registry)
e14dd4d Merge pull request #1157 from kstaken/1156-entrypoint-builder
87a69e6 Merge branch '1156-entrypoint-builder' of github.com:kstaken/docker into 1156-entrypoint-builder
f64dbdb Override Entrypoint picked up from the base image that breaks run commands in builder
2b55531 Removing the save to disk as it was not really necessary
e43ef36 Remove all network dependencies from the test suite
08a87d4 Fix #1162 - Remove bufio from Untar
90f372a Merge pull request #1163 from dotcloud/1137-change_search_size-feature
3ec29eb Merge pull request #1066 from mhennings/fix-broken-streaming-result
3a20e4e add if to prevent crash
fd97190 uses the terminal size to display search output, add -notrunc and fix bug in resize
70480ce Merge pull request #1030 from dotcloud/builder_display_err_log
bf7d6cb rebase master
c059785 Merge pull request #1161 from dotcloud/add_remote_addr_debug
a0f5fb7 add remote addr in debug
ad33e9f Merge pull request #1138 from dotcloud/1123-rmi_conflict-fix
1d1d81b Cleanup white space
f3d2969 Override Entrypoint picked up from the base image that breaks run commands in builder
758ea61 Replaced gendered language in the README
e2b8ee2 Fixed runtime_test (ImagePull prototyped changed)
07dc0a5 Merge pull request #1144 from dotcloud/standalone_registry
d3125d8 Code cleaning
283ebf3 fmt.Errorf instead of errors.New
4c174e0 Fixed ping URL
57a6c83 Allowing namespaces in standalone registry
cfc7684 Restoring old changeset lost by previous merge
be49f0a Merging from master
66a9d06 Adding support for nicer URLs to support standalone registry (+ some registry code cleaning)
6940cf1 Merge pull request #1127 from cespare/patch-1
4e0cdc0 Revert #1126. Remove mount shm
8a81096 Merge pull request #1129 from cespare/style-fixes-2
dc8b359 Merge pull request #1126 from karanlyons/patch-1
dea29e7 Fix error in rmi when conflict
ab6379b Merge pull request #1133 from dotcloud/775-testing-notifications
f7fed2e testing, issue #775: Add automatic testing notifications to docker-ci
35e87ee Merge pull request #1132 from dotcloud/776-testing-commit
ab3893f testing, issue #776: Ensure docker-ci test docker code as it was at commit time
1277dca Style fixes for fmt + err usage.
ba9aef6 Typo fix
dd619d2 Mount /dev/shm as a tmpfs.
1e2ef27 Pushing an Image causes the docker client to give an error message instead of writing out streamed status.
bcb5e36 Merge pull request #1111 from cespare/style-fixes
19121c1 Implement several golint suggestions, including:
27ee261 Simplify the NopWriter code.
da39622 Gofmt -s (simplify)
e93afcd Use fmt.Errorf when appropriate.
dd1b9e3 Typo correction: Excepted -> Expected'
96bc9ea Merge pull request #1112 from cespare/mutex-style
16c8a10 Merge pull request #1053 from dynport/do-not-copy-hostname-from-image
5dcd11b Merge pull request #1109 from dynport/remote-lookup-fix
dc91a7b Merge pull request #1113 from metalivedev/docs20130702
11998ae Fix installation link from welcome page.
1cf9c80 Mutex style change.
6dbcdd3 Merge pull request #1095 from metalivedev/docs20130627
9632cf0 fix two obvious bugs???
96ab3c5 Merge branch 'docs20130627' of github.com:metalivedev/docker into docs20130627
ff964d3 Cleaning up the welcome page, terminology, and images.
4b8688f Fix broken quickstart link
55b5889 Merge branch 'docs20130627' of github.com:metalivedev/docker into docs20130627
dd4c6f6 Shortened lines to 80 columns
6058261 Clean up image text, minor updates to docs.
b461e46 Adding files for terms
d399f72 Cleaning up the welcome page, terminology.
c9e1c65 Merge pull request #1107 from eliasp/issue-1020
3042f11 never remove the file and try to load it in start
e5e47c9 Don't remove the container= environment variable, as it is crucial for a lot of tools to detect, whether they're run inside an LXC container or not.
1c50833 Merge pull request #1103 from shin-/1060-pull-only-tagged-images
27a137c change file location
7cc294e When no tag is specified in docker pull, skip images that are not tagged
a20dcfb Merge pull request #987 from dotcloud/601-packaging-ubuntu
06b53e3 store hostConfig to /tmp while container is running
8f9dd86 Merge pull request #1101 from dotcloud/fix-unit_tests
ebba0a6 add sleep in tests and go fmt
c9236d9 Merge pull request #1099 from lopter/master
f03c1b8 More unit test fixes
6f23e39 Merge pull request #1097 from dotcloud/bump_0.4.8
fe0378e Rephrase changelog
96a1d7c Bump version to 0.4.8
79ee8b4 Merge pull request #1046 from dotcloud/1043-output_id_non_attach-fix
55a7a8b Merge pull request #1092 from lopter/master
b47873c Clean up image text, minor updates to docs.
adf75d4 Adding files for terms
cb1fdb2 Cleaning up the welcome page, terminology.
d1d66b9 Merge pull request #1078 from kstaken/fix_json_error
6dacbb4 Fix TestGetInfo when there is more than one image in the test repository
ead9cef Merge pull request #1089 from dotcloud/multiple_test_images-fix
185a2fc Merge pull request #1086 from crosbymichael/1008-image-entrypoint
fb8fac6 Merge pull request #1088 from kpelykh/master
b6f288a Fix unit tests when there is more than one tag within the test image
aa9bec9 Issue #1087 Docker Java API client -- added java to Docker Remote API Client document
11e2884 change to top
b16ff9f Add Entrypoint to builder and container config
348c5c4 Merge pull request #1085 from dotcloud/1076-doc_delete-fix
8dcc6a0 fix status code in doc
3b5ad44 rebase master
5e029f7 Merge pull request #1061 from proppy/fix-slices-ref
52cebe1 Keep debian package up-to-date
d8d33e8 Adding check for content-type header
b37f7d4 Documented release process for maintainers in hack/RELEASE.md
d67d5dd Merge pull request #1065 from dotcloud/bump_0.4.7
273e0d4 * Hack: change builder tests to always use the current unit test image, instead of hardcoding 'docker-ut'
ca497a8 Bump version to 0.4.7
b722631 * Hack: move unit tests to a different source image, to work around issues when docker-ut has more than 1 tag.
84f4195 Merge pull request #1052 from lopter/master
54da339 api,server: slice are already refs, no need to return ptr
ac37fcf Fixed conflicts
893c974 Resolve conflict
30342ef Merge pull request #700 from dotcloud/615-pushbyid
6165c24 Merge pull request #1057 from dotcloud/973-testing-stabilization
72befee Fixed issue in registry.GetRemoteTags
648c4f1 Add test
af2a92f testing|stabilization, issue 973: Use docker-golang PPA and lts-raring kernel
ad2f826 go fmt pass
e095a15 Allow push by ID when using a custom registry
c3dd6e1 Several fixes and updates to make this work with latest changes in master
67ecd2c Reenable writeflusher for pull
57d751c Remove https prefix from registry
5007510 Rolled back of previous commit (skip cert verification)
2a1f8f6 Ignore 'registry not found' when pushing on independent registries
1c81791 Skip certificate check (don't error out on self-signed certs)
de0a48b Tentative support for independent registries
8589fd6 Add doc
2e79719 add /proc to list running processes inside a container
9bfec5a do not merge hostname from image
a11fc9f Merge pull request #1032 from andrewsmedina/govet
e12a204 Merge pull request #1028 from dhrp/bugfixes-on-docs
fe014a8 Always return the correct test image.
aa8ea84 Fix a nil dereference in buildfile_test.go
3175e56 URL schemes of both Registry and Index are now consistent
800d900 Ignore stderr while doing tests
1a201d2 Merge pull request #1035 from dotcloud/fix_panic_cast
750c94e Merge pull request #1041 from unclejack/fix_minor_kernel_version_for_git_kernels
bd144a6 Make sure the ID is displayed usgin run -d
2a20e85 Improve last log output
5ed4386 remove + from minor kernel version
9d3ec7b fix panic with unix socket
e68a23b Merge pull request #1019 from dotcloud/1002-change_update_progress_bar_rate-feature
6cf493b following 'go vet' in utils pkg.
3d5633a following the 'go vet' suggestions.
c4a44f6 Merge pull request #1029 from lopter/master
3e29695 Merge pull request #602 from gabrtv/111-bind-mounts
46a9f29 - Runtime: small bugfixes in external mount-bind integration
6723995 - Fix a few bugs in external mount-bind integration
d4e6210 * Runtime: better integration of external bind-mounts (run -b) into the volume subsystem (run -v)
4fdf11b + Runtime: mount volumes from a host directory with 'docker run -b'
cd0f22e Merge pull request #1005 from dotcloud/1004-stdin_piping-fix
27d6777 Display containers logs in case of build failure
e5c0b31 Add a script to create the docker-ut image
5cdbd2e Merge pull request #1021 from errnoh/fix-test-filled-tmpfs
b44e2e7 Merge pull request #1010 from dotcloud/1009-testing-hack
73afc63 Bugfixes on docs
6127d75 Add missing fprintf instead of printf
fb86dcf TestKill and TestMultipleContainers: run sleep instead of cat /bin/zero. fixes #737
bccf06c update progressbar every MIN(1%, 512kB)
5190f7f Implement regression test for stdin attach
873a5aa Make NewDockerCli handle terminal
672d3a6 Make term function consistent with each other
a749fb2 Make DockerCli use its own stdin/out/err instead of the os.Std*
25d1bc2 Fix issue when attaching stdin alone
cc63c1b Testing|hack, issue #1009: Update make kack environment
41cdd9b Packaging|ubuntu, issue #601: Allow packaging prerm to do its job
ec6b352 fix raw terminal
42bcfcc add options to docker login

git-subtree-dir: github.com/dotcloud/docker
git-subtree-split: 9b57f9187b84c5cdb92cb50271988aa4c51e8b95
Merge commit '1d0911aecca603738e968fee0b9a70369aba2eb9'
Squashed 'github.com/dotcloud/openstack-docker/' changes from 082fac0..aec346d

aec346d Added glance blueprint
de31d71 Merge pull request #8 from dexa187/master
d784e28 Merge pull request #1 from dexa187/patch-1
d4300ed Updated api.py

git-subtree-dir: github.com/dotcloud/openstack-docker
git-subtree-split: aec346df1f7d53aa5ba3cbe8482100014809327f
Merge commit '5a0aa4ac606652d0b1b81d22c6ac1560f24262af'
Squashed 'github.com/ehazlett/shipyard/' changes from ea5a474..9aeaaa9

9aeaaa9 more test updates
a8c403b updated test script
a8eb450 bump for buildbot
b91e123 doc updates
c5ee564 more test setup
2c100e0 more test setup
14feb57 added test run script
7eaa9eb Merge branch 'docker-volumes'
a20167c fixes #10: data volume support
54e1eed Update readme.md
7fba2d1 updated readme
b6865ae updated readme
f2db433 Merge branch 'applications'
92cdafa added config updates for applications upon container restart
fc536c9 added application creation, edit, deletion, etc.
189cb5c initial application support
72dcc77 added memory limits for containers and uptime reporting

git-subtree-dir: github.com/ehazlett/shipyard
git-subtree-split: 9aeaaa9fd587e09d01017cc51b501a7f812097f7
Merge commit '982bb1eb3a20f6a35208f96edf4abbb29572947d'
Squashed 'github.com/fsouza/go-dockerclient/' changes from cfd656d..aeddd43

aeddd43 testing: fix DockerMapping related code
94bf0f8 desculpa, foi garotice e nao vai se repetir.
cc1971b testing: fixed list containers.
d12b27f testing/server: added filter by state in container list.
37b7aee testing: returning error if container is running on removeContainer
4e48e4c fixed start container behaviour to works with last docker version.
e9f0fee container: replace ErrNoSuchContainer with NoSuchContainer instances
4e0b4bb container: introduce NoSuchContainer
62ff8f6 attach: fixed logs behaviour to use hijack instead stream.
9f5057c client: fix code that depend on docker
c0d7ca2 testing: finish pushImage implementation
9d91946 testing/server: replace pat with gorilla
f9d84e2 testing/server: add pushImage, still empty
e1c2bdb testing/server: add hook support
72d776d testing/server: calling return after http.Error

git-subtree-dir: github.com/fsouza/go-dockerclient
git-subtree-split: aeddd4392ac87b6e06e22e174fb9cb54f42340f8
Merge commit 'd7aa75c513315146f72a898cda7d67f598c0bf54'
Squashed 'github.com/globocom/docker-cluster/' changes from dcfe616..62c0153

62c0153 cluster: increate test coverage
01b0c1c cluster: increase test coverage
9c5dad9 cluster/tests: add scheduler that always fails
95a5017 cluster: fix go vet warning
2825103 cluster: change return type of the Scheduler.Nodes
a07c9d6 cluster: register nodes in the scheduler only when it is able to
f1c8d45 cluster: split Scheduler interface
bdbb3c4 cluster/container: fix error handling in WaitContainer
054a8c6 cluster: use Storage in CommitContainer
38b381d cluster: use Storage in AttachToContainer
4b5d425 cluster: use Storage in WaitContainer
f7bfd40 cluster: use Storage in RestartContainer
09cc582 cluster: use Storage in StopContainer
d9ead53 cluster: use Storage in StartContainer
6275139 cluster: use Storage in RemoveContainer
b2a5e89 cluster: use Storage in KillContainer
92c82e6 cluster: add support for storage in InspectContainer
9552e9c cluster/test: return proper error in mapStorage
ce24e12 container: use storage in CreateContainer
87369c9 cluster/test: fix mapStorage
f2233aa cluster: add SetStorage method
765a64d cluster: add Storage interface
e82b45f cluster: fix WaitContainer
e7b1437 cluster: use Scheduler
fb3f4d2 cluster/scheduler: gofmt -s -w .
aaaa90a scheduler: add method Nodes to the Scheduler interface
0b6c9ad cluster: fix go vet warning
e20a487 cluster: add Scheduler type
6707a14 cluster: don't return the ID of the node in CreateContainer
1fa8106 cluster: use better message in empty cluster panicking
d38f864 cluster: add test for race condition
7df35e5 travis: installing tsuru/safe
8ce74e4 cluster/image: use safe buffer to avoid data races
151bb63 cluster/container: use safe buffer to avoid data races in tests
d8d6fe1 travis: run race detector
dfbb2a6 cluster: fix race condition in runOnNodes
f7186e2 cluster: fix code related to go-dockerclient
1161e7d cluster: delete blank lines

git-subtree-dir: github.com/globocom/docker-cluster
git-subtree-split: 62c0153edfa3b27ee985d25177af041df2b43752
Merge commit '812f9d2f08c270a65bb21d9b466be3b33ca33c8e'
Merge commit 'b0ff072df02a9e81c33a5235bffa90ff03ddc2eb'
Squashed 'github.com/globocom/tsuru/' changes from 12a8553..b960062

b960062 cmd/tsuru: also improve feedback on key-remove
776e3e7 cmd/tsuru: improve feedback on key-add
058fc13 gofmt.
450e051 impelemented swap cmd.
8765a6a cmd/tsuru: added Info for swap cmd.
5b7b683 api: fixed swap method.
a6a9df7 added docs about app swap.
f7618e5 api: added route for swap.
3143527 api: added handler for swap.
77471cd app: implemented swap.
e879ded provision/juju: implemented Swap for juju.
f2fe413 router/elb: implemented routes for elb.
c8a6391 router/hipache: implemented Routes.
2d180f2 provision/docker: implemented swap.
d0a1436 added Routes method to Router interface.
7384725 provision/docker: fix TestSchedulerInvalidEndpoint
17ec407 provision/docker: fix TestSchedulerNoNamespace
4b14021 provision/docker: implement segregatedScheduler.Schedule
5b5b297 remove routable interface.
99cbaa6 provisioner: added method Swap in provisioner interface.
9122e9f provision/docker: fix build
a322704 provision/docker: remove some dead code
0cef3e4 provision/docker: remove unused function
88f99b5 misc: using chown instead -u to to prevent password ask.
39fedec provision/docker: fix code related to recent PortMapping change
2fba484 provision/docker: starting to implement segregatedScheduler
c142d49 misc/docker-setup, misc/tsuru-setup: calling setup_platforms script after all installation/configration stuff is done
22b85d7 etc/tsuru-docker.conf: removing default index
b01536f misc/tsuru-setup: changing setup_platforms function call order
55b8cee misc/tsuru-setup: removing repeat call to install_mongodb function
6c3f8d5 misc/docker-setup: uncommenting pkg installation for those who are on AWS
53aed23 misc/proxy-setup.bash: exporting NO_PROXY env var in /etc/profile
0f9ae7d misc/hipache-setup: setting npm proxy after installing npm
0273deb privision/docker: docker implements the Routable interface.
8aef4da provision/juju: juju provisioner implements the Routable interface.
e433051 router: updated the Routable interface.
900ebe4 router: added Routable interface.
1233a88 misc/docker-setup: replacing git protocol with https before trying to install hipache
43110c6 misc/proxy-setup.bash: changing proxy variable names on read
671cfd0 etc/tsuru-docker.conf: merging docker:run-cmd:bin with docker:run-cmd:args
86b6909 docs/api: added docs about update a service.
c54e06a docs/api: added docs about revoke access from service.
5926416 docs/api: grant access to a team.
ec8c97c docs/api: added docs about update docs.
897ffd8 docs/api: get service docs.
68c9862 misc/docker-setup: removing .pub extension when generating ssh key
f773281 api/server: added key list url route
97885e8 api/auth: created listKeys handler
ed63064 docs/api: added docs about service info.
df70f4a Merge pull request #494 from dgryski/deploy-cmd-needs-version
b2b12f9 docker: update unit test for git-ref version
b1fb9ff docs/api: fixed format.
efe83ad docs/api: fixed method for create a service.
21cc9b9 docs/api: added docs about remove a service.
c2ad6c8 docs/api: added docs about create a new service.
a8f6bfb docs/api: added docs about service list.
c8905f3 provision/docker: fix docker-cluster related code
aa6c3ac docs/api: docs about how to get a quota info of an user.
d361872 docs/api: added docs about create an user.
c0d04d2 docs/api: added docs about reset password.
1cd2420 docs/api: added docs about login.
1b12f08 docs/api: update status code info about change password.
e4b3185 docs/api: added docs about change password.
839a369 docs/api: added docs about logout.
f00003f docs/api: added docs about remove an user.
087fca6 docs/api: added docs about add key to user.
1d759e5 docs/api: added docs about remove key from user.
e37d407 docs: added docs about api get info about a team.
29fb056 docker: fixed stop container tests.
44a3cf6 docker: removing image after remove unit.
412ac56 docker: commit returns the image repository.
357a01e docker: remove some comments.
1da1549 AUTHORS, CONTRIBUTORS: fix Sidnei email
5f61f54 router/elb: gofmt -s -w .
06c256c docs/api: fix formatting
3aad659 docker: stop a container before remove.
0b859b4 docker: implemented container.stop method.
46ebe86 Merge pull request #493 from dgryski/run-tsr-as-ubuntu-user
b290e35 docker: the deploy command needs the git-ref-id too
5930f30 docker-setup: tsr should run as 'ubuntu', not as whomever is running the bootstrap script.
571cdc0 router/elb: refactored the way to get the elb endpoint.
c1ad02d Merge pull request #492 from dgryski/fix-git-hooks-environment
d7fa8ef docker-setup: remove call to renamed function
0d0ac19 docker-setup: git hooks require config in environment
9765359 juju: remove loadBalancer.
41b9102 juju: removed elb manager from queue_test.
c22f7ea juju: remove elb manager from provisioner_test.
68fc8e9 juju: removed LoadBalancer.
376f6fc provision/juju: using router in heal.
8062f87 provision/juju: using  router in remove unit.
e201854 provision/juju: using router to get Addr.
4e6f326 provision/juju: using router for add route.
3eaf5a1 provision/juju: using router for add/remove elb.
cd5edf8 router/elb: added support for vpc.
7ebda3e provision/juju: added a method to return the router.
212823a Merge pull request #491 from sidnei/master
9180680 Rename ProvisionUnits to ProvisionedUnits since it is a method that returns provisioned units, not a method to provision them.
08c6404 added Sidnei da Silva in AUTHORS and CONTRIBUTORS.
b856725 Merge pull request #487 from sidnei/master
0ea4d70 Fix typo in error message
0c2cdb2 router: fixed a typo.
859d30e router/hipache: added more logs in add route.
e089e67 router/elb: implemented addr.
00993ab router/elb: implemented remove router.
dece8ef router/elb: implemented add route.
b24dcbb router/elb: added defer to remove backend.
b8db2aa router/elb: simplified add backend.
1bd26f1 router/elb: implemented remove backend.
7117161 router/elb: refactored add backend tests.
204ec36 router/elb: implemented add backend.
bd389d7 Merge pull request #485 from dgryski/docker-setup-create-ubuntu-user
e7c2002 docker-setup: ensure ubuntu user exists
c0a34de misc/docker-setup: using sudo with -E flag
7a28655 docs/api: added  docs about generate token.
032325d docs/api: fixed typos.
ddc9878 docs/api: remove user from team.
053d2aa docs/api: remove an user and add user to team.
7793e56 docs: removed format for team add.
0cc740e docs: added docs about how to execute a healer.
e9896c8 docs: added docs about healer list.
18a2904 schema: fixed app schema required.
4a4e8ff Merge pull request #484 from dgryski/docker-setup-download-loop
f9e88e0 docker-setup: bash has loops, use them.
2f15ce9 misc/docker-setup: moving beanstalk start to tsuru-setup script
eb9fd12 misc/platforms-setup.js: fixing field name
e7fc7a2 misc/platforms-setup: created script to add platforms in mongo
057f8af misc/docker-setup: refactoring function that download scripts
ca828f2 docs: added docs about add team.
fbc1b30 docs/api: fixed a typo.
94bdcf1 docs/api: added docs about team list.
1b92689 docs/api: added docs about list platforms.
c0deaf8 docs/api: added docs about remove environ.
6f3a951 docs/api: added docs about set environ.
061de4b docs: added docs for get env.
73bdf30 docs/api: restart an app.
00b35a3 docs/api: added sections for all 'endpoints'.
ab54c6d docs: improved api docs.
f57c59b Merge pull request #483 from dgryski/gandalf-setup-fixes
f41f42e misc/proxy-setup: removed old comment
c94a8f7 misc/docker-setup: passing -E flag to sudo in curl so we maintain proxy envs
a746a3b misc/docker-setup: fixing hipache setup file name
4568448 misc/proxy-setup: sourcing /etc/profile after writing proxy conf on it
1a1b23b gandalf-setup: make sure .ssh exists, or 'key-add' will fail.
80bc0ce gandalf-setup; 'sudo su - user' is redundant.
8776fbc docs/docker.rst: updating docker install docs to other install files if are not present
7f64e1b misc/proxy-setup: fixed use of existent shell(or bash) set function
348e53b misc/docker-setup: changing mode of downloaded files
85791d2 misc/proxy-setup: fixing typo
d9a9144 misc/docker-setup: created function that downloads scripts if they do not exists
493c94a misc: moving proxy settings to execute first than other scripts
b96219d Merge pull request #481 from dgryski/fix-docker-latest-again-oops
8195dc5 misc/hipache-router: keeping environment variables when running npm with sudo
2325cae docker-setup: s/docker-master/docker-latest/; # oops, missed one after testing
27de74f misc/proxy-setup: prompting for proxy configurations on docker install
2581166 misc/docker-setup: configuring git to never use git protocol
d5d80f4 CONTRIBUTORS: adding @dgryski
6976539 Merge pull request #479 from dgryski/fix-docker-download
4981dae docker-setup: silence wget output and fix tar extracted filename
f4a978d docker: added logs on create and start container.
799737d api/app_test,api/suite_test: migrating test handlers from app_test to suite_test
9f6b277 auth/user: created ListKeys method.
522647c router/elb: implemented router interface for elb.
f6ed5ae provision/docker: handle absense of "docker:servers" setting
8d7c464 travis: create .tsuru_target file
a3b37dc provision/docker: log restart progress to the app
30fbced provision/docker: rename test file
2d91c18 testing: add method FakeApp.HasLog
577519f testing: add method "Logs" to FakeApp
e22db04 provision/docker: improve logging in Deploy
f9b8618 misc/build-server: make the script more atomic
92c10f6 misc/build-server: rebuild everything
3cbdd37 provision/docker: fix deploy output
8fb424b deploy: fix tests
8c13f78 provision/docker: don't use ResponseWriter after the request
d29736c testing: writing to the writer on FakeApp.Restart
b4f9a00 go fmt.
0db3611 removed mored comments.
b46f93a removed comment.
9deba3b provision/docker: improve logging
ddc0b0a Revert "log: add log.Llongfile to Loggers"
3143b30 docker: fixed tests.
9eb1927 docker: running start in background.
424ac0a action: added a mutext for action.Result.
ca972ff docker: extract serialize and restart logic to a func.
664a620 log: add log.Llongfile to Loggers
e17d526 docker: refactored test container deploy.
8f1a02d docker: refactored test deploy remove container.
63d777e docker: fixed stopContainers.
ddeb2e0 docker: refactored test deploy.
4242ed5 docker: executing restart after deploy.
10d4ea0 deploy/git: fix logging and docs
73820c9 provision: improve docs for App.Run
1294f24 app: splitting stdout and stderr in loadConf
4a22f2d docker: enabling stdout in attach and add attach for stderr.
ed0ca62 provision/docker: call replicateImage in the commit method
30e2322 provision/docker: add replicateImage
cb4bd04 docker: runing ssh with sudo.
f71fc85 provision/docker: fix NewServer call in SetUpSuite
ce0a18c provision/docker: remove print from test
670c003 provision/docker: simplify code in stopped
96f9a06 provision/docker: commit images with name

git-subtree-dir: github.com/globocom/tsuru
git-subtree-split: b960062b782c537ffe1aa29045aa8a95505a15e1
Merge commit '6c8c2170ab60eccc6a9756b28528b1e1317ca1ac'