jingweno/gh
Squashed 'ant0ine__go-json-rest/' changes from 0b86a0a..f9e9207

f9e9207 Bug fix: make the *splat notation work with encoded URLs

git-subtree-dir: ant0ine__go-json-rest
git-subtree-split: f9e9207fc7f81be7edfe2cf9000a9e9cc0db6978
Merge commit 'c2ce34f3b38cacfc736513d21b06651722419e6b'
Squashed 'astaxie__beego/' changes from be92903..b2abb4e

b2abb4e fix #66
951881b update typo
832f160 update
2bbd21a update docs for hotupdate
4553677 support hot-update

git-subtree-dir: astaxie__beego
git-subtree-split: b2abb4eb80118d738e92a2dbe121da892f8dcb6c
Merge commit '9d4df0fb1eddd919c026313f4c6508ff336b8906'
Squashed 'astaxie__build-web-application-with-golang/' changes from 1dfcbc6..215efca

215efca Merge pull request #209 from cyfdecyf/master
f267dad Fix build script.
e5d0586 Merge pull request #206 from syhou/master
8c8af14 修正：处理TCP连接的goroutine在退出前关闭连接
c590132 Merge pull request #1 from astaxie/master

git-subtree-dir: astaxie__build-web-application-with-golang
git-subtree-split: 215efcae58d299fe6c0cb89d7599e6bf8b279ef7
Merge commit '4703a8bd4ad481cfe5b8dd72a04bddd4d9bb2530'
Squashed 'benbjohnson__go-/' changes from 147d3c5..f9ec2ed

f9ec2ed Minor cleanup.
847bf85 Clean up TestTakeAndSendSnapshot test.
769a5ed go fmt
3bcf91a Merge branch 'master' of https://github.com/xiangli-cmu/go-raft into xiangli-cmu-master
bb7caaf Add RemovePeer().
86bff03 add unit test for statemachine
4fc43b6 add statemachine interface
4d96f35 add snapshot unit test
349a1ab solve conflicts
f15cade add snapshot unit test
77c63cc Add error lookup for committed log entries.
718ef79 add snapshot_request.go
842aa1a fix issues (https://github.com/benbjohnson/go-raft/pull/19)
c0e1613 clean the codes
32729ef solve conflicts
4b06328 Merge branch 'master' of https://github.com/xiangli-cmu/go-raft
3a6fc7b add log-compaction
4ca46e7 Serialize election timeout goroutine.
8efbb15 Fix peer timer race condition.
c544519 Fix timer race condition.
d0dfd4a scratch log-compaction
ba9b773 Add Server.LastCommandName().
894eb08 Merge branch 'master' of https://github.com/benbjohnson/go-raft
1bd88d5 Track current leader.
df58f67 Merge pull request #16 from philips/master
258e2cf LICENSE: initial commit
20301ed Merge branch 'master' of https://github.com/benbjohnson/go-raft
0d9f1f0 Clean up API.
d311b79 Merge pull request #15 from xiangli-cmu/master
e1d7a7a delete the redundant codes when using setCurrTerm
f8973a5 fix leader field of Server

git-subtree-dir: benbjohnson__go-
git-subtree-split: f9ec2ed5ebfbfd66b1e93015e5cb0f2bb983dd8c
Merge commit '239a3e91b63b4f9edc526dc327bd4cb5e7f4cd60'
Squashed 'bitly__nsq/' changes from da7057d..ebf8d10

ebf8d10 add more release notes to ChangeLog
1213137 bump to stable 0.2.21
86e4859 Merge pull request #221 from mreiferson/flakey_test_221
702640b nsqd: deflake output buffering test
1e6af14 Merge pull request #220 from mreiferson/float_fix_220
8b881ae nsqadmin: fix conversion of time.Duration to float64
fafc65a Merge pull request #218 from mreiferson/statsd_crap_218
6dd61d7 nsqadmin: introduce --statsd-interval which is necessary for installations which dont use 60s
0c9a0e0 nsqd: make --statsd-interval take duration syntax and improve docs
55b0f2b update ChangeLog
e7f9b86 Merge pull request #217 from mreiferson/new_topic_channels_217
e543b5c docs: added links to 0.2.20 binaries
ee31e04 nsqd: fix new topic channel lookup/creation
d2cd54e Merge pull request #214 from mreiferson/dq_meh_214
b4cee1e nsqd: dont open diskqueue writeFile with O_APPEND
1b42282 nsqd: cleanup diskqueue files when we recover from tail corruption
6029857 nsqd: add --sync-timeout for time based diskqueue fsync
e45251a nsqd: move code out of diskqueue ioLoop into functions
770f9b6 nsqd: mark diskqueue for syncing when corrupt

git-subtree-dir: bitly__nsq
git-subtree-split: ebf8d10486751ea324914a98feebd4aad712da0b
Merge commit '8347d613a50a4fa7337f1de4ece3d49b38062e25'
Squashed 'crowdmob__goamz/' changes from 45770a8..f107984

f107984 Fix for correct attribute parsing on set values
bb7558f a little more testing on nil slices vs. empty slices in dynamodb marshaller
1b81e66 Marshalling implementation for DynamoDB
1ab9f61 tabs to 2 spaces fix

git-subtree-dir: crowdmob__goamz
git-subtree-split: f10798410c2a49e70ebf1f90876e3ed1fb853503
Merge commit 'c0b234715c1b484c713be988228bb6be31e5c466'
Squashed 'davecheney__autobench/' changes from 4f579ac..5b16c1f

5b16c1f added freebsd/arm rfom hp n54l

git-subtree-dir: davecheney__autobench
git-subtree-split: 5b16c1f8a23dc9110a9325fea883952a59a71dc2
Merge commit 'ad7d76b9fac1cd73fded60528a985be8edcdd457'
Squashed 'dotcloud__docker/' changes from 078a19d..092c761

092c761 Merge pull request #853 from kencochrane/registry-api-1.1-fix
2d5eda5 Merge pull request #864 from dotcloud/851-choose_public_port-feature
f8af296 Merge pull request #865 from dotcloud/errors_commands-fix
432e189 Merge branch 'master' of ssh://github.com/dotcloud/docker
3ea6a2c add Michael Crosby to AUTHORS
20bf0e0 * Remote Api: Add flag to enable cross domain requests
dd53c45 Add OPTIONS to route map
ac599d6 Add explicit status response to OPTIONS handler
ca4597e Add links to libraries, fix #800
eeea9ac Add list of Docker Remote API Client Libraries. Fixes #800.
0a28628 Add Cors and OPTIONS route unit tests
bcc4754 Merge pull request #869 from fsouza/fix-api-docs
5712e37 Merge pull request #840 from dhrp/just-fixed-some-links
b1ed750 docs/api/remote: fix rst syntax in the "Search images" section
47d7486 Merge pull request #814 from dotcloud/708-pushpull-multislash
d227af1 Escape remote names on repo push/pull
4e18010 Support for special namespace 'src' (highland support)
2a6a1d4 Merge pull request #867 from Turbo87/patch-1
37c20fa Fixed broken link in README
ab0d0a2 fix errors when no body
0de3f1c add tests
95d66eb specify public port
393e873 Add Access-Control-Allow-Methods header
956491f Merge pull request #855 from samjsharpe/fix_missing_hyphen
5e6cd21 Build from Dockerfile on stdin requires a hypen There is a missing hypen in the documentation:     `docker build < Dockerfile` will complain     `docker build - < Dockerfile` will not complain
9e1cd37 seperated the registry and index API's into their own docs
968e08a Merge branch 'master' of ssh://github.com/dotcloud/docker
56473d4 Typo in MAINTAINERS file
da937bf Update README.md
42b63eb Daniel Mizyrycki is maintainer of dockerbuilder, the official build environment for docker binary releases
0d6db33 docker-build contrib script is deprecated by the new 'build' command
3999465 Merge branch 'master' of ssh://github.com/dotcloud/docker
1cc4049 Merge pull request #827 from dotcloud/dev_environment_update
a118ad9 changed to 12.04 and add kernel
0f23fb9 Fixed some links
f1992ee Merge pull request #817 from dhrp/blog-in-navigation
97d5f52 hack/PRINCIPLES.md: a list of principles guiding Docker's design. The goal is to scale the decision-making in the project and remove @shykes as a bottleneck as much as possible
2ea29ce hack/ROADMAP.md: a high-level roadmap. Make a pull request to suggest changes
068076f Merge pull request #822 from lopter/master
34c8b24 Merge pull request #812 from dotcloud/809-progress_message-fix
e3cc625 update doc to newer go
b4682e6 bump to master
04050c4 Merge pull request #818 from johncosta/ubuntu-1304-add-apt-repository
7e6ede6 Print the container id before the hijack in `docker run` (see also #804)
7ef9833 Put back panic for go1.0.3 compatibility
c1ee9bf Merge pull request #808 from dotcloud/795-lintify
c000ef1 Remove provider specifc language
479ac9a Merge pull request #802 from johncosta/ubuntu-1304-add-apt-repository
716892b Modified the navigation in both website and documentaion to include the Blog.
d7a6485 Merge pull request #796 from dhrp/added-and-fixed-links
fd224ee linted names
3922691 fix progress message in client
c566c8e Merge pull request #810 from dotcloud/proxy-fix
06b585c fix proxy
e61af8b some installations of ubuntu 13.04 (digital ocean Ubuntu 13.04 x64 Server in this case) require software-properties-common to be installed before being able to use add-apt-repository
86ada2f drop/omit
b515a5a go vet
6d5bdff Add flag to enable cross domain requests in Api
10ef4f7 Merge pull request #797 from dotcloud/registry-fix-missing-body-close
cff3b37 Disabled HTTP keep-alive in the default HTTP client for Registry calls
82dd963 Minor changes in registry.go
830c458 Fixed missing Body.Close when doing some HTTP requests. It should improve some request issues.
38f29f7 Changed some text on the website to include docker-club Fixed a link in the FAQ on the docs Fixed a detail in the Makefile for pushing the site to dotcloud
a8ae398 Bumped version to 0.4.0
7a4408f Merge pull request #794 from dotcloud/780-diff-fix2
854039b remove TrimLeft as it's go1.1
070923b Merge pull request #792 from dotcloud/780-diff-fix
71b1657 added test
1bafe9d Merge pull request #793 from dotcloud/774-remove_login_check_on_pull-fix
1ce4ba6 remove check on login
2b1b3c1 Merge pull request #784 from dotcloud/remove_cgo_dependency
8243f25 Update test to reflect new ApiInfo struct
0443cc3 Merge pull request #772 from dotcloud/improve_version_info_cmds
e16c934 fix Path corruption in 'docker diff'
e42eb7f Meta: added Guillaume as primary maintainer for tty code
cebfde9 Merge pull request #787 from gasi/nodejs-centos-docs
eff7a15 Merge pull request #785 from jweede/master
82dadc2 Document installation of npm dependencies /ht @grigio
2d52d4d Merge pull request #789 from samjsharpe/fix-extra-brace
ca5ae26 Removes a brace in the description of the wait command
464765b Add link at the beginning
e9ffc1e Add Node.js web app example using CentOS
4fb9a6e Use code blocks
1575478 Name examples consistently
2935ca7 Use title case for consistency
23452f1 Use em dash in title
f6f345b Fix typo
e3fd61a Add more tags
01ce63a Make style consistent
3ca9c11 Add Mac OS X instructions for doc tools
b4df0b1 Add `make server` command to preview docs
7f65bf5 Spelling correction in docs
a70dd65 Move Termios struct to os specific file
3cc0963 Remove unused constants
31eb01a Use uintptr instead of int for Fd
64f3467 Remove cgo from term
f41d2ec Update api docs
1dae7a2 Improve the docker version and docker info commands

git-subtree-dir: dotcloud__docker
git-subtree-split: 092c761cec2e89f73c3810ff8f2f4ffb01db53b0
Merge commit 'e8012c4939b876236b24a0b4b8a79ebddd8fc53c'
Squashed 'garyburd__go-websocket/' changes from 7ca721e..10bdcbb

10bdcbb Improve documentation.

git-subtree-dir: garyburd__go-websocket
git-subtree-split: 10bdcbb813ef6d842f7838d0c5001d98d01b6450
Merge commit 'cb91ee2d2054528c0a11b5d0a9a48196f174ae69'
Squashed 'globocom__tsuru/' changes from 7bb363f..e688dd3

e688dd3 docs/apps/deployment: started documenting the deployment process on tsuru
1141d44 docker: added port in deploy cmd.
c23e516 docs/why: adding missing links into description
7ed1a53 docs/why: explaining tsuru extensibility before comparison table
cf084b4 docker: added -d for deploy cmds.
6f0a16c docker: not using version for deploy.
6b82004 docker: added repository in deployCmds.
7f58544 docker: added version parameter in deploy cmds.
e906af0 docs/why.rst: improving document description text
6d0f5bd docs/why: filling comparison table
744f3fe docs: added download page.
261ea0d docker: removed commandmocker.
1a205d0 docker: removed app parameter from runCmds.
a67eaa9 docker: storing image id on start.
c61792d docker: added a way to set image.
3b6d714 docker: removed commandToRun.
07d0739 docker: added ssh commands to start commands.
f059c98 docker: removed old deploy \o/.
6c2f989 docker: using start instead oldDeploy in addUnits
fee4e2a docker: returning container in start.
59ed11b docker: removing container after deploy.
b8d19c1 docker: deploy should not store the imageId.
8522570 docker: added imageId parameter in runCmds.
cbaf5f0 docker: added imageId parameter in start method.
cc9a78d docker: returning image id on deploy.
cddcb66 misc/gandalf-setup: preserve environments.
07478b6 misc/tsuru-setup: preserve environments on add key for mongod.
5ed6ea9 docs/why: fixing table
1c91440 docs/why: starting comparison table with other PaaSs
82924fa docker: using deplou cmds on provision.Deploy.
f3a90b2 docker: store image info in container.
3431710 docker: commiting image after deploy.
c905ea0 docker: added start command.
26bc63d docker: extract commandToRun from newContainer.
4487ae1 docker: added method to execute newContainer with deploy cmds.
6a7310d docker: refactored container.create.
72effe9 docker: added initial deploy method.
07558ac docker: renamed deploy to oldDeploy.
e257e2b AUTHORS, CONTRIBUTORS: add Sergey Koulikov
c09f8b9 Merge pull request #463 from KettlebellAddict/master
002a1ca Updated the documentation.
78e1ec1 cmd/term: rename termios_darwin to termios_bsd
cb1b759 docs/contribute/setup-dev-env: update instructions
e3381f6 cmd/term: added termios_linux.
fa5c39e docker: removed getSSHCommands.
906426a docker: using sshCmds instead getSSHCommands.
af31363 cmd/term: use syscall.Termios instead of conditional compiling
906dd50 travis: fix tar syntax for gnutar
0c0fde0 travis: fix stderr redirect on apt-get install
a843fde travis: fix stderr redirect
a991848 docker: added more tests for sshCmds.
7ea371e docker: added sshCmds.
ac07253 AUTHORS, CONTRIBUTORS: add Raninho
d5eba0a Revert "travis: disable notifications"
178eb35 travis: also redirect standard error stream
6df954a travis: simplify beanstalkd installation
261c3aa travis: fix build steps
6449e8f readme: added droid ribbon.
7fd821b readme: fixed build status @ travis-ci.
5fe3b0b tsuru: added travis-ci ribbon and go 1.1 into travis.yml.
a958bc0 docker: added comments for deployCmds.
c292425 docker: added method to return run commands.
5b95c46 docker: Added method to return the deployCmds.
4d30a74 docker: passing ssh commands to the create app in newContainer.
e515930 misc/mongodb/start: send repair to syslog too
24423f2 docker: removed image type.
890dfa0 docker: added method to removeImage.
e7b5f25 docker: Added commands arg in container.create.
1bb0431 docker: Added commdans args in newContainer.
38ec567 docker: added commit method on container.
0ef8b50 docker: method to return the docker bin.
93f546b docker: Using getImage in commandToRun.
17234bf docker: Added repository name in image name.
2010262 docker: get image name or id from app.
7abe1f3 provision/docker: use return instead of fallthrough
363852e misc/test-hooks: checkout old version, testing post-receive
8e2a3b6 Revert "fabfile: remove post-receive via deploy_hooks"
296fef2 misc/git-hooks/post-receive: providing version to the cloneRepository handler
8f79b79 misc/git-hooks/pre-receive: removing cloning stuff
6a7d272 Revert "misc/git-hooks: remove post-receive"
cd58e56 fabfile: remove post-receive via deploy_hooks
05ab2c4 misc/git-hooks: remove post-receive
a5caa57 misc/git-hooks: running deploy on pre-receive
95cba77 api: change the HTTP method for cloneRepository
bffe7da api: read version from the body in cloneRepositoryHandler
f41c7e5 provision/docker: use the saved version to deploy new units
1745a13 exec/testing: fix dead lock caused by wrong method call
6fe1211 provision/docker: store the version of the container on deploy
ef20f25 cmd/tsuru-base/apps: calling unset cname url instead of seting it to emtpy
2eb98a8 api: created unsetCName handler and redefining cname actions related urls
6306b82 docker: added method to get image from app.
0d14561 Revert "provision/docker: fix parsing of docker inspect output"
4887f59 provision/juju: set app-repo option on Deploy
0efc937 provision/docker: implement version support in container.deploy
4f25f78 log: support log files.
7d0cbee hipache/router: ignore redis.ErrNil in getCName
eace83d provision/docker: fix parsing of docker inspect output
2ac4a54 collector/runner: extract loadConfig from Run.
27a3292 collector/runner: using log.Init.
1455a30 api/server: using log.Init.
c99783a log: added a method to Init the log.
603c1ac actions: changed log message.
ac881bd router/hipache: validating CNAME before recording it
7d6d548 etc/tsuru-docker.conf: adding hipache:domain conf
07bc5c5 api/server: extract loadConfig from RunServer.
14d7baf api/server: extract log init from runserver.
aae75c2 api: added names for api actions.
a339a25 app: added name for app actions.
491d5e9 action: added names for stub actions.
558ba79 fixed typo.
aa74de0 action: logging the Backward execution for the action.
dbeebd4 action: logging the Forward execution.
ee382c2 action: added a Name to the action.
2ed56e5 api: fix deploy
b5d8019 app/app_test.go: provisioning app before unsetting its cname
751a7d2 router/hipache/router_test.go: fixing redis connection related stuff
a2f6116 router/hipache/router.go: removed unused helper method
72b2edd router/hipache: changing SetCName to remove old CName record from redis
9274d14 app/app: created UnsetCName method
86cc832 docs: added initial ruby quickstart.
0e4d8fa router/hipache: use a connection pool for Redis communication
54a1792 router/hipache/router: deferring close of redis connections
ef3733e provision/docker: moving code
b03b112 Revert "router/hipache/router: deferring close of redis connections"
c2693bb collector: logging one step back
2269520 provision/lxc: pass the version to the Git deployer
49597b4 provision/juju: pass the version to the Git deployer
9bb6f3d deploy/git: rename pull to fetch and run git fetch instead of git pull
48f9611 deploy: calling checkout from Git function
7f0d2e6 deploy: added "checkout" unexported function
5734f00 testing: added method Version to FakeProvisioner
fc63235 testing: fix selects
a9a6652 deploy: fix build
34dfec9 provision/docker: remove containers directly when it cannot remove unit
df72403 provision/juju: fix Deploy signature
fc598f0 provision/docker: fix Deploy signature
edd66fb provision/lxc: "fix" Deploy method
cbb4b6b api: fix cloneRepository handler
6230037 api: fix tests related to recent FakeProvisioner changes
6ae953c app: fix tests to match the new behavior of the FakeProvisioner
8109c74 testing: improve FakeProvisioner's UnsetCName implementation
448b884 testing: improve FakeProvisioner's SetCName implementation
9ed43e0 testing: check that the app is provisioned before installing deps
a4ea130 testing: check that the app is provisioned before restarting it
2b5b4fc testing: refactor FakeProvisioner
8d7d635 testing: add some documentation for the FakeProvisioner
94ad60b testing: fix Deploy implementation in the FakeProvisioner
b12ae2f provision: change Deploy method
626873e provision: removed unused cname methods on lxc and juju provisioner
8dc79f8 fs/testing: fix FakeFile.WriteString
9476adc fs/testing: fix FakeFile.Write behavior after Truncate
c810d5c app: calling provisioner.SetCName on app.SetCName
09cd1c6 testing/provisioner: added method to check whether an app has a cname or not
3f923a0 testing/provisioner: added Set/UnsetCName in FakeProvisioner
7236e4f provision/docker: defer close calls on database sessions
ad06eac api: call Provisioner.Deploy instead of app.Deploy
120d6b1 app: remove the Deploy method
48b0b92 router/hipache: RemoveBackend now also removes CNAME related records on redis
1d15c03 cmd/tsuru-base: fix code that use the git package
77e9c30 git: rename GetRemoteUrl to RemoteURL
efc77e1 api: fix code related to the errors package
d49536b service: fix code related to the errors package
82e1b7b errors: rename Http to HTTP
97a0910 router/hipache/router: deferring close of redis connections
f31bee4 router/hipache/router.go: using getCName helper method
daf1158 router/hipache: RemoveRoute now removes respective CNAME record, when exists
37684c6 testing: fix some golint warnings
9c3ac95 service: fix some golint warnings
f254c76 repository: fix golint warnings in tests
df2eae7 queue: fix golint warnings
d12a7cc provision/lxc: fix golint warning
1590a61 provision/juju: fix golint warnings
e99a8a9 provision/docker: fix golint warnings
4e3099c log: fix golint warning
e7e9875 git: fix some golint warnings
29b371b fs/testing: fix golint warning
a1626af exec/testing: fix golint warning
30c83e7 errors: fix golint warning
0f3cc6c db: fix golint warning in test
f635f78 cmd/tsuru-base: fix some golint warnings
642137e cmd/tsr: fix some golint warnings
9c9358f cmd/tsuru-admin: fix code related to the cmd package
cd60a67 cmd/tsuru: fix code related to the cmd package
6931df2 cmd/tsuru-base: fix code that depend on the cmd package
65276ae cmd/crane: update code to match new cmd packag
a9568e6 cmd: fix some golint warnings
a5ad19f cmd: fix variable name
759e8aa api: fix some golint warnings
fb6196e app: fix some golint warning
6534ee9 check-fmt: remove -e from bash call
d16a424 app: expand environment variables in the sourced method
74bf421 provision: implementing CNameManager interface on all available provisioners
b1485ab router/hipache: testing addRoute helper method
c835300 router/hipache: AddRoute now reflects it's changes to CNAMES when they exist
29c16cc router/hipache/fake_test.go: supporting redis reply by command

git-subtree-dir: globocom__tsuru
git-subtree-split: e688dd3034904421f217deff20c5227602a08611