Squashed 'src/github.com/abh/geodns/' changes from abdf9d0..e2ae6c1

e2ae6c1 Fix parsing of targeting option
0c23ff7 Fix crashing bug when targeting to regions and city database returns nil
b625aa6 Add serverID to _country responses
abded9e Fix GeoIP custom directory bug (in geoip library)
ca37d45 Update version to 2.4.2, update CHANGES

git-subtree-dir: src/github.com/abh/geodns
git-subtree-split: e2ae6c12d85c4052e6d62077ccc8e61e68477f04
Merge commit 'ef100961bc168d427d3562a3825d4dccefe200ae'
Squashed 'src/github.com/adnaan/hamster/' changes from 403b5c0..126a012

126a012 Update README.md
dfb074e remove reduntant tests

git-subtree-dir: src/github.com/adnaan/hamster
git-subtree-split: 126a0123dbe535cfc3f1a267cabdb7bcb5bf0c22
Merge commit '31fda5d9ee1893e5b49aecc21ec3c9a673a638ff'
Squashed 'src/github.com/benbjohnson/go-raft/' changes from 29ebf5c..5ed9d2e

5ed9d2e Merge pull request #119 from coreos/upstream
95caa73 use sort.Reverse
38d588f sort the commitindex of peers in descending order
32466c9 Merge pull request #117 from grncdr/patch-1
f81ef8d Fix a word in README
f21c206 Merge pull request #115 from goraft/http-transporter-fix
957e71b Use Peer.ConnectionString in HTTPTransporter.
1b88b71 Merge pull request #114 from coreos/upstream
426830f Merge https://github.com/goraft/raft into upstream
c159d91 fix takesnapshot
adb4299 chore(server): spelling error
f8486a5 Merge pull request #113 from coreos/upstream
f92654b expose protobuf encoding/decoing API
dbedc98 fix snapshot related issue
0e62627 check sendSRR response
b71d2ec Merge pull request #112 from goraft/minor-refactor-add-remove-peer
26365a2 Minor refactor of AddPeer/RemovePeer.
ad4053e Merge pull request #110 from coreos/conf
923770a Merge pull request #111 from mattn/windows
fdec6d5 Use os.File.Sync.
851ca9c add connectionstring
ff29c6d wip/ move write/read to server.go and add test
ce1bd81 add todo
8ed555b merge
cd98f72 conf
b67b95a Merge pull request #109 from coreos/upstream
f16052c minor fix
132dae3 before remove the node, flush the remove command to the node first
27906fd snapshot should be an API
e02eb83 Merge pull request #107 from philips/fixup-internal-imports
4a76e46 fix(misc): update to new URL
89a6c5b chore(*.go): fix imports for protobuf
c4c93e6 Merge pull request #105 from philips/minor-grammar-fixes
5d2eda5 chore(README): minor grammar fixes
bddabe5 Merge pull request #104 from philips/cleanup-README
dbed707 feat(README): reorganize assuming someone knows raft
c8de7db chore(README): add an introduction section to the Overview
8a8912a chore(README): add the travis badge lower
63069fb Merge pull request #103 from philips/un-nest-add-peer-logic
406a9ca fix(server): un-nest arg checking
99f0d0a Merge pull request #102 from Mistobaan/master
559a01e use switch.(type)
54bd5eb use switch.(type)
a9aa074 nip comment
1247826 use switch.(type)
6332689 use switch.(type)
0a18dcf Merge pull request #101 from Mistobaan/master
e5530c4 add defer to guard against unexpected panics
6fcb929 add mutex
d467482 Merge pull request #99 from coreos/fixSnapshot
5ad230d should break instead of return
28c8de8 delete print
11e6b1a when restart, compact all the log entries before snapshot. Avoid wrong startTerm
c75ee47 Merge pull request #96 from coreos/fixSnapshot
9a987d9 Merge pull request #97 from benbjohnson/remove-timer
31817cf Remove timer.
31db0ff init fix

git-subtree-dir: src/github.com/benbjohnson/go-raft
git-subtree-split: 5ed9d2edb56b3ab583144d950ce468df1057260a
Merge commit '132b01ee1b165c2d73400a7e0e172f3480b20a75'
Squashed 'src/github.com/bitly/nsq/' changes from f9704ff..022b2d8

022b2d8 nsqd: fix test that was poking into internals of simplejson
a3ebb0b update ChangeLog
033684e Merge pull request #274 from mreiferson/pause_persist_274
ad22953 nsqd: persist metadata when (un)pausing channels
0381c8c Merge pull request #273 from sneak/patch-2
1145491 change test timeout from 15s->60s
9b524b4 Merge pull request #269 from mreiferson/statsd_prefix_269
582f78d nsqadmin: add --statsd-prefix
b9a00db Merge pull request #241 from mreiferson/binary_mput_241
8530263 nsqd: add --statsd-prefix flag
b4d0431 nsqd: add ?binary flag to HTTP /mput
57fea7e Merge pull request #229 from mreiferson/compression_229
a237e04 nsqd: re-org, move flush into client
04f324d nsqd: add/use DefaultBufferSize
d3e525e nsqd: add framed snappy compression
c5d2cc2 nsqd: add deflate compression negotiation:
085b0a4 bump to 0.2.23-alpha
4c9328d Merge pull request #236 from mreiferson/high_cpu_236
043b79a nsqd: increase default output buffer timeout:
d13042d Merge pull request #264 from mreiferson/move_go_nsq_264
51ede02 go-nsq: move to github.com/bitly/go-nsq
47e7304 Merge pull request #262 from mreiferson/apps_262
7988acf move examples to apps & bench
e987d16 bump 0.2.22; go-nsq 0.3.2; update ChangeLog
efb7609 Merge pull request #260 from mreiferson/notification_260
dbb8e63 nsqadmin: add node information
b798938 update travis builds to go1.1.2 and add GOARCH=386
b711c15 Merge pull request #244 from mreiferson/alignment_244
f89fc71 fix 32bit alignment issues for 64bit atomic variables
8c032e4 update ChangeLog
e9969a2 Merge pull request #255 from mreiferson/async_writer_255
617a674 nsq_to_nsq: proxy a topic from producer(s) to destination nsqd over TCP
3cc7236 writer: refactoring to support async functionality
840acd7 Merge pull request #256 from mreiferson/single_node_256
a2196ff nsqadmin: single node view
bff79fc Merge pull request #259 from mreiferson/persist_race_259
7e4bdb0 Merge pull request #258 from jehiah/new_connections_rdy_258
9383b50 drop RDY count on existing connections
de500a0 nsqd: prevent racing metadata persistence
f542929 Merge pull request #257 from jehiah/new_connection_rdy_257
a878c64 update connection RDY state at connect time
cfb0003 Merge pull request #254 from jehiah/rdy_distribution_254
ee09b68 RDY Improvements
9b4f0c0 Merge pull request #249 from mreiferson/mem_statsd_249
d79d94d nsqd: send mem/gc stats to statsd
b8c17f3 update ChangeLog
765056f Merge pull request #250 from jehiah/lookupd_poll_interval_250
08cc1ff Merge pull request #251 from mreiferson/http_publish_limits_251
c64da54 Merge pull request #252 from mreiferson/cpu_profile_endpoint_252
37cb986 reader: lookupd poll changes
52cd7e8 nsqd: limit the amount we will read for HTTP publishing
dba5d02 nsqd: cpu profile should be .../profie to support direct profiling
8463add Merge pull request #248 from mreiferson/symbol_248
8415e6e nsqd: add /debug/pprof/{cmdline,symbol}
c421a6e update ChangeLog
0c81828 Merge pull request #247 from mreiferson/mput_empty_247
2f12047 nsqd: TCP PUB and MPUB invalid message lengths
e52a903 nsqd: /put and /mput should discard 0 length msgs
98ca2d9 Merge pull request #245 from mreiferson/panic_245
f25f1bb nsqd: refactor stats collection for regression introduced in #242
1154c59 Merge pull request #243 from jehiah/is_starved_243
13665ab limit IsStarved() to connections with in flight messages
902cfb4 Merge pull request #239 from mreiferson/http_mput_bytes_239
c67c43d Merge pull request #242 from mreiferson/in_flight_client_242
44bf625 nsqd: dont retain client pointer for inflight msgs
3d8aa78 nsqd: dont alloc huge backing array for HTTP /mput
3e53d8a fix wording

git-subtree-dir: src/github.com/bitly/nsq
git-subtree-split: 022b2d869e8187e10d5c4d1dd3f45cbf6b3cd34e
Merge commit '84a6a04196d2aa5d9c1cc3db5e116485a9deb41d'
Squashed 'src/github.com/buger/gor/' changes from 6ac8034..4305b72

4305b72 Merge pull request #24 from buger/refactoring
578d785 Fixed previous merge
6946fc6 Merge branch 'master' into refactoring
8535872 Merge pull request #23 from fern4lvarez/review
a1f9cc5 General review: - Fix typos - Follow some Go good practices - Better documentation, more consistent godoc.org - Refactoring
f07586a isIncomingDataPacket should be struct function
fa684d4 Used maps instead of slices for storing messages
c3330cb Use close(channel) instead of creating new channel
3cb98aa Use less buffer
cbc4204 Some minor changes
de93abe Added RawTCPListener test
9908e8d Update README.md
5a4c27d Update README.md
e3d1fb4 Update CHANGELOG.md
0233ef7 Update CHANGELOG.md
4a68bea Fixed tests
fd47cc1 Update version
26455e4 Updated tests debugging
5aca51e Update README.md
af45f82 Update README.md
5bae7c5 Don't exit on panic
af2d478 Add error logging for http server
041c20e Add concurrency settings to test
d425a7c Merge pull request #19 from buger/listener_limit
528980c Fixed listener
c899791 Merge pull request #18 from buger/listener_limit
b6cce83 Update README.md
09175ea Updated README
3c84a0c Remove debugging
77751af Added listener limit option
00d3103 Add rate-limit tests
e42c3a9 Make tests more modular
a9ca7ea Make tests more configurable
40a4886 Refactored tests
97f2bb7 Disable redirects

git-subtree-dir: src/github.com/buger/gor
git-subtree-split: 4305b72608dc95e16e511104fd38eb6861fc33a0
Merge commit 'fe577398dff0ad48621aebc4bfaa77d7d2aee8d6'
Squashed 'src/github.com/coreos/etcd/' changes from 0310268..5cc585a

5cc585a Merge pull request #201 from rca/master
d64cf5f Update README.md
c988b1e Merge pull request #199 from zined/update_documentation
5a7ba24 adopt documentation to implementation
9a5775c fix(CONTRIBUTING): try and fix # links in markdown
482afb4 Update CONTRIBUTING.md
68206a7 Merge pull request #197 from philips/add-contributing
98eba60 feat(README): add contributing section and file
c345203 README: add russellhaering/txectd
dbf6990 Merge pull request #194 from mburns/patch-1
248992e Typos
8a7e5fc Merge pull request #187 from sakana/master
c565ac2 Merge pull request #192 from xiangli-cmu/master
266519c fix typo
6f32b2d fix timeout
1d31b57 Merge pull request #191 from philips/fixup-spelling-error-stats
6fb1d8a fix(raft_stats): spelling followers not follwers
8fc1abd Merge pull request #184 from xiangli-cmu/master
cc722a4 change peer to follower
2eb0625 mrege and change peerstats to followersstats
9825976 Merge upstream
21f6b50 Merge pull request #189 from philips/cleanup-stats-further
da01fe6 fix(command): make Latency and Counts objects
cbd8a4f feat(scripts/test-cluster): add a cluster test command
20488b4 Merge pull request #168 from xiangli-cmu/cleanupStats
0ef9d94 fix(gitignore): ignore the actual binary
aff4af1 fix(build): use /bin/sh
0b37c80 Fix nil logger in inits
a121cbb Switch from golang log to coreos/go-log
951d467 Swith to coreos/go-log from ccding/go-logging
a8ff1b2 init peerStats in transportation.go; avoid nil pointer due to restart from snapshot(we do not keep stats in persistentlayer yet)
3a0a8c8 Merge pull request #183 from xiangli-cmu/master
24b34d0 bump 3rd party
c5c3604 Merge pull request #182 from xiangli-cmu/master
d3fbf6d bump 3rd party
940294d README: add jdarcy/etcd-api, a C library
48d234c Merge pull request #179 from jplana/patch-1
ca84d11 Added new python client
fba31a8 README: add binocarlos/yoda
11f94d4 Merge pull request #175 from AndyPook/master
f03481f add equivalent Powershell scripts to ./build so that etcd can be built on Windows
09f31af Merge pull request #173 from derekchiang/patch-1
62b8b7a Update README.md
eff09ad feat(README): add coderanger/etcd-chef
9caca30 Merge pull request #171 from ithinkihaveacat/mv-testAndSet-foo
f923548 Change key "testAndSet" -> "foo" for clarity
8d245b5 cleanup
23e99b5 Merge pull request #135 from xiangli-cmu/moreStats
86e03d2 format
31aa3df clear up raft_stats
43cb2a3 only leader will return peer stats
44e8c23 merge master
db534fd Merge pull request #161 from philips/add-faq-section
380326b feat(README): add note about cluster size
8cf8792 Merge pull request #160 from diwakergupta/patch-1
a623eff Add another Java library for etcd
f50ea7d Merge pull request #159 from hayesgm/master
b366f10 Blank prevValue in POST should be interpreted as a blank test-and-set, not a normal set
adbcbef feat(README): add python library transitorykris/etcd-py
b300d28 README: add justinsb/jetcd project
dee496b Merge pull request #153 from philips/add-cors
2f50155 feat(etcd_handlers): enable CORS
40dcde4 Merge pull request #152 from evan-gu/tranWithTimeout
90d7ebe gofmt
8eaa950 change heartbeattimeout to electiontimeout
fec65d8 change DefaultHeartbeat to DefaultElectionTimeout 	modified:   raft_server.go 	modified:   transporter_test.go
0c39971 change default heart beat to electionTimtout
51941fa add timeout for transportation layer
946f9ea merge
a90bb85 	modified:   README.md
43f808f Merge pull request #150 from evan-gu/master
a22bd2b full version for readme
d56d790 Merge pull request #151 from philips/listening-ip-cleanups
de0a8c6 feat(README): document -cl flag
e28fd7c fix(README): use 127.0.0.1 everywhere
bfeed19 feat(etcd): Default server listen and client listen to advertised IPs
59599dc Update README.md
0166edc Merge pull request #147 from iconara/patch-3
b8d85e6 Change leader and machine result examples in readme
32cf8dd Merge pull request #145 from philips/add-listen-host
351e84a feat(etcd): add listen host parameter
197689f Merge branch 'master' into moreStats
8264156 Merge pull request #143 from xiangli-cmu/master
6108f85 add testandset test
808eb64 tmp commit
4a61797 Merge pull request #142 from Mistobaan/master
a543d64 Split raw get into rawGetNode and rawGetNodeList
6345e02 test and set creates the key if key does not exists. fixes #96
91aed9e Fix error code in README.md
50d53f3 fix(README): add cd etcd on build instructions
29b7aab Merge pull request #141 from Hoverbear/patch-1
4f436ae Added a PUT handler that copies the behavior of the POST handler. Fixes #139.
23995ff add recvQueue
4adc17e Merge pull request #140 from marineam/quote
e856acf fix(build): If you quote in shell you're going to have a bad time.
6ef18b1 thread-saft queue
9b7109b Merge pull request #137 from fatih/patch-1
8eca7b2 Merge pull request #138 from fatih/patch-2
800c471 Fix api urls in examples
7563a13 Fix error code in README.md
10cdaea make a better array cyc-queue
f75c309 sampling sending rate
896c944 add serverStats
2b66641 bump deps
9a63723 add sdv
d8cd744 fix remove node
e4b164c add avg
7a9fae9 better warn on restart the entire cluster
41b2175 Merge pull request #134 from xiangli-cmu/removePeer
a97590f basic stats
dd2f856 if the whole cluster dies, should not panic
798d52e simplify remove/join process; add tests
fb9f09d use commandname
49c160b change getMachines
64e6d54 add remove peer
e7caa14 Merge pull request #133 from xiangli-cmu/master
57ef6e9 add killallAndReocery test
7b28904 Merge pull request #130 from philips/add-version-to-join2
b430a07 chore(name_url_map): rename version to raftVersion
52cbc89 Merge pull request #132 from philips/add-new-projects2
e848659 feat(README): add etcdenv project
9683bd3 Merge pull request #131 from philips/add-new-projects
2991bf5 feat(README): add etcd-vim
e073123 feat(README): add some new projects
bfc68e8 fix(raft_server): rename getLeaderVersion to getVersion
3fff0a3 fix(version): add raftVersion to the version file
fc776f2 fix(raft_server): add comment on version field
e79f684 fix(command): change Version to RaftVersion
2c9e90d feat(raft_server): do not allow mixed versions
53b2038 feat(command): add version to join command
e091923 Merge pull request #128 from xiangli-cmu/bump
f813017 fix raft api
111888a bump(code.google.com/p/goprotobuf): 1141ccae4b85
ea28b1c bump(code.google.com/p/go.net): bc411e2ac33f
2662b3c bump(github.com/ccding/go-config-reader): 8b6c2b50197f20da3b1c5944c274c173634dc056
7ec0ee2 bump(github.com/ccding/go-logging): 4f3650d51969cc425c1940efa31fcb7c0bba86b3
13afdb0 bump(github.com/coreos/go-etcd): 460022c1238ee0913013936e3486f41a3c7c1d7a
449cad4 bump(github.com/coreos/go-raft): bb7f7ec92e4cb6d98241cea83f55d0e85e624189
393ed43 Merge pull request #127 from xiangli-cmu/master
1527b70 fix test
5357fb4 Pull deeply nested logic into functions
cf2d688 add error package
8ed67be clean error handling
ef4aef9 Merge pull request #126 from philips/fix-missing-info-file
bcc77db fix(config): use IsNotExist to test missing file
f1786b8 Merge pull request #122 from philips/fix-nip-in-transporter
ec6a7be Merge pull request #124 from philips/xiangli-cleanup
e50871c remove unused struct
5bd24d8 wait for exit and release resource
c459b4b go flavour
981351c use type inheritance
012e747 make ttl test not so strict. testing server is not fast
e0ca8f2 add newJoinCommand func().
ca4b581 make raft and etcd server
f490fba also return API version
6bdb9af handler version at /version
7004a6b fix travis
177854c add test package. do not compile test codes with etcd
ee66f23 clean getMachines
c7e7e13 handle readInfo error
9240258 use var()
fb00d33 cleanup print
c3533d6 fix test
cb33641 clean up
2c09cd7 chore(trasnsporter): delete unused variables
f8764df Merge pull request #121 from philips/alternative-go-version-check
70f2590 feat(go_version): check go version at build time
0cb5eef Merge pull request #118 from philips/fix-test-and-set
3e59bad fix(command): be consistent will all CommandNames
22b943e Merge pull request #117 from mairbek/locking
ac9801f Concurrent GET requests should not block.
b17a2e2 Merge pull request #114 from zefhemel/dockerfile
9ede78d Added dockerfile
fe2d1c1 Merge pull request #109 from xiangli-cmu/fmilo
915266d move tslconf to conf.go
3940196 move trans related func to trans.go
f7dc48a gofmt
b718113 fix race
82fe001 move etcdMux to etcd_handlers.go (better proximity code)
0aebf37 use check utl
6299f31 use check util
3102420 use infof instead of fmt.Printf
e7d15b6 split config
339d8b4 move to util
e6d8d40 split raft server logic into separate module
ad55b42 Update README.md
7afbbb2 Merge pull request #102 from Mistobaan/master
d88bfc0 fix doc
ddc53c6 use filepath
21c658b Merge pull request #86 from xiangli-cmu/master
58e9e0c add comments in snapshot.go
969c8ba log remoteAddr in etcdHttpHandler
32d1681 change name to url in http handlers
6ac6dfc Merge pull request #100 from xiangli-cmu/fix95
928781a fix #95
1107f1d Merge pull request #98 from philips/node-library
1bf4e65 feat(README): add node library
aad1626 typo(README): thanks asbjorn
2b14fbe Merge pull request #94 from philips/fixup-readme
e8a284d feat(README): point people at etcdctl
0e26d96 Merge pull request #93 from philips/fixup-readme
b3654e6 fix(README): fixup a grammar bug
9d85c74 fix(README): use -n everywhere
47babce feat(README): add the active-proxy project
408d0ca fix(README): remove url highlight
2403fe7 Merge pull request #92 from philips/add-default-name
5a88da1 fix(etcd): add a default name
af202c7 Merge pull request #89 from philips/readme-fixups
08abb4b feat(README): add a link to binary downloads
fb93103 Merge pull request #87 from philips/remove-insecureskipverify
74fb19a Merge pull request #88 from philips/readme-fixups
8e48a20 clean up trans.go
8f3e6f3 remove duplicate codes
6120fa6 remove duplicate codes
d8a05f1 feat(README): add note about the license
f8e68ba feat(README): at a versioning section
fa6c8f4 fix naming in long_test.go
14ed8e9 fix(README): use fixture certs
be85442 fix(etcd): remove insecureskipverify
1124fe2 cleaning up
e3dae8f do not print out debug info when testing
d3649d3 gofmt
434b004 add snapshot
64eeca3 add snpshot
9fd6229 Merge pull request #85 from philips/fixweb
a86e3aa feat(test): add TLS tests
9f14e75 fix(fixtures/ca): generate with clientAuth and serverAuth
03a2d60 add x509 extended key usage
0e11256 better naming in join
6f38851 fix test
466229c fix(etcd): reverse the cert handling
7f9c2ee fix(transporter): consistently print debug
f1ad907 chore(transporter): add spaces before return
d9a8ca1 feat(fixtures/ca): Initial commit
3be13a3 fix(etcd): use transporter scheme in joinCluster
7db07aa fix(etcd): fatal when err != nil
eb8f1dc fix(etcd): fixup TLSInfo json
8c09f98 chore(etcd): cleanup TLS configuration
9111617 chore(etcd): introduce sanitizeURL
6610fc3 defaultScheme based on tls
84624f1 fix join command
bbf78b0 update
ba697f6 fix web
60c71a9 fix(etcd): checkURL on webURL
0e5ee27 fix(web): don't share the DefaultMux
8174669 fix(etcd): be more explicit with name error message
328b92e able to get root dir
076bd99 Merge pull request #78 from xiangli-cmu/separate_id
ce3c55b refactor
d3471ee separate_id
eadced5 Merge branch 'separate-id' of https://github.com/philips/etcd into separate_id
0bb9fe9 hack(go-etcd): stop appending schema to everything
a190488 feat(trasnport): add an independent node name
06fab60 simplify createTrans
7b38812 Merge pull request #75 from philips/cleanup-README
22ef916 feat(README): add a tools and libraries section
fff8aca fix conflict
054e75f fix(README): misc language cleanups
2b648bf chore(README): un-nest the sections
becc459 chore(README): simplify explanation of the Index field
3de81f9 fix(README): cleanup wording on first etcd run
488a254 chore(README): it is Go not go
2868565 Merge pull request #74 from philips/cherry-pick-mistobaan
1e62e92 Merge pull request #73 from philips/fix-tests
384d79d remove duplicate logic
f4fc4ca remove pointer to map
140bbfe nip
f5c2d19 nip
ab10f95 set messager as send only
e0b8771 fix(test): add sleep in createCluster
30c9b98 Merge pull request #72 from philips/tests-do-not-listen-publicly
fd58cf8 chore(*test.go): use 127.0.0.1
b36feec Merge pull request #71 from philips/pretty-print-conf
5000e1d chore(etcd): pretty print the conf json
f6e5d29 Merge pull request #70 from philips/fixup-cli-options
9d488f5 fix(README): change -i to -f
04318ff fix(etcd): rename ignore to force
27000cf chore(etcd): un-nest error handling logic
99d69cf feat(etcd): print out log line of where the configuration is
5e8f9a5 fix(etcd): use . as the storage
6a9a0a6 fix(etcd): use Info structs for "start" functions
8e5a24d chore(etcd): introduce argInfo variable
f946ff0 fix(etcd): log same port argument
17cfe22 bump(code.google.com/p/go.net): 3591c18acabc
044c659 bump(github.com/ccding/go-config-reader): 02eda1a8218709cdcbd6fe2d53cd76128ac13526
b1f1af8 bump(github.com/coreos/go-etcd): c21388f46a08162660f44cc7c7267cc4c66d571e
8dc7dd7 Merge pull request #68 from philips/refactor-third_party-a-bit
7247d9b chore(update): put the deps into their own file
c39f771 fix test
a790fbc Merge pull request #55 from xiangli-cmu/master
e5aa625 Merge https://github.com/coreos/etcd
b8cefd3 Merge pull request #63 from philips/add-travis.yml
ba7ddbc feat(README): add a travis badge
3f07b37 fix(third_party): etcd from go-etcd was accidently gitignored
d7c6d0c fix(gitignore): be more specific on dirs
a6b7b8c fix(gitignore): ignore the etcd binary not everything
8144c40 bump(code.google.com/p/goprotobuf): 44b59d41add2
af2fa2a bump(github.com/ccding/go-config-reader): fcf8cc3fb5100a2466c414cea91a4bb6344087fd
4bf87b8 Merge pull request #64 from Mistobaan/master
f746b1e feat(travis.yml): Initial commit
a15b4bb gofmt
742589a nip
1b69ebc nip
efc14b7 nip
c109da4 Merge pull request #62 from philips/re-add-etcd-to-banner
dc6480d fix(gitignore): ignore the pkg dir
436e2a8 fix(test): update this to use build
4247e1c prevent white spaces as being accepted as valid host
50277df format
51ae55e fix(client_handlers): re-add etcd name to banner
11a7cd0 nip
63f28ba nip doc
115dbdb Merge pull request #61 from Mistobaan/master
b6378da use go's syntax
0de2eff use switch
7c6d383 Merge pull request #60 from philips/const-the-versions
ab9c044 fix(version): make the version numbers const
bbdc802 Merge pull request #59 from philips/generate-release-version
14436fc Merge pull request #58 from philips/update-third-party
a7deba0 feat(version): generate version from git tags
253765d bump(github.com/coreos/go-raft): e129a0807cdcbd53440c1d722907043d06c16f1b
9115a7e fix(third_party): don't intermix go-raft
418611a Merge pull request #57 from philips/README-update-build
e2a1662 README: update build instructions
4177546 Merge https://github.com/coreos/etcd
0045b3b Merge pull request #56 from philips/add-third-party
5f6d331 feat(third_party): use this directory
a585f5f bump(github.com/ccding/go-config-reader): ed2b178dfa43911665337544ccec96e57820daab
6813a92 bump(github.com/coreos/go-etcd): 9d174bd052fc49e53d5978c2ecd81770aee3788d
bb7ed93 bump(github.com/benbjohnson/go-raft): d46748244f1f1830a002b8f645342426c5d73e81
c03d466 feat(third_party): initial update script
6b3bbc1 bump(code.google.com/p/goprotobuf): d54cbe4bdc25
46bce9c bump(code.google.com/p/go.net): ca4c826193c2
20833eb bump(bitbucket.org/kardianos/osext): 84d8cbacbe13
7992171 bump(github.com/ccding/go-logging): d4e747a24b2af160872a886a430a16ac65f76456
aac485d bump(github.com/coreos/go-raft): 75c9644bbc43e5ef7805480c13deacec02195706
d0e9449 use url package to parse url; fix commented codes
65c3445 fix test file
d239e5e fix join redirection
bebcf4b simplify tree list
09cfd89 better error name for watcher
793d518 fix wrong join redirection
b8c89a1 Merge pull request #54 from xiangli-cmu/master
c6a4321 gofmt
63ba16f add clone func to help snapshot. add benchmarks
39fa2eb add benchmarks
026f93c add watch benchmark
10b5bc9 fix wrong snapshot path
06c9f18 avoid set value to root
b046e18 Merge https://github.com/coreos/etcd
dc2eae8 fix watcher test and keyword test
8a4b2e8 change create->new, follow go spec
6b08b55 Merge pull request #51 from polvi/master
0d0b59b Make a note about go 1.1
ce33c4d gofmt
66f4e0a clear watchers before recover from a snapshot

git-subtree-dir: src/github.com/coreos/etcd
git-subtree-split: 5cc585af961844c4766340e9058fb8956cf5c41b
Merge commit 'c271692db7195eb84d1333a8385e716d436ded89'
Squashed 'src/github.com/crowdmob/goamz/' changes from 19deb1e..f71626d

f71626d Merge pull request #36 from DerekL/master
6fc892d Add DescribeAddresses request
a71c358 Merge pull request #35 from derekpitt/fix-sqs-queueattributes
2dad990 fix xml tags in sqs Attribute type. add tests to deep compare attributes
06b23b2 Merge pull request #34 from rubyphunk/master
b5db26f Rename attribute modifier
faacdf2 Fix behaviour of DeleteItem.
df77597 let PutItem work with attributes with quotes in teh value
679a6c3 do not require a response from dynamo during an update, because sometimes it's an empty json
226ea2b DELETE item shortcut
32de5eb update to new dynamo GetItem api
8d7690c Merge pull request #33 from rvitale/master
c9b296e Merge pull request #2 from rvitale/feature/parallel-scan
bb2a61d Fixed auth issue.
f673f00 Merge pull request #1 from rvitale/feature/parallel-scan
0a91a93 go fmt
1f72390 more fixes related to auth.Token vs. auth.Token() in sdb
6e0d395 more fixes related to auth.Token vs. auth.Token()
6fa1d05 fix token calls to aws.Token
d06b4a8 fix PR bugs for sign test
8070547 Merge pull request #30 from alimoeeny/patch-10
976a53b Merge pull request #29 from alimoeeny/patch-9
7c5bc53 Merge pull request #28 from alimoeeny/patch-8
d778ef8 Merge pull request #27 from alimoeeny/patch-7
ed2ff7a Part 4
96951be Part 3
2b21a78 Part 2
bf2cd2b part 1
e8e9084 Merge pull request #25 from alimoeeny/patch-5
070f72d Merge pull request #26 from alimoeeny/patch-6
ec95bed Updating the tests to pass with #25
4e2b2e1 Get auth needs to accept and return token as well as accesskey and secretkey
4afa459 Added parallel scan feature.
311a7bd Merge pull request #21 from shopsmart/v4signer
5d9165a Creating new common AWS V4Signer. Adding AWS Signature Version 4 test suite. Update dynamodb to use new V4Signer. Removing old dynamodb signer.
5f7bc4d readme formatting
eabd711 Merge pull request #20 from philipsoutham/master
d800ceb Enable PUT Action
1259015 Merge pull request #19 from rubyphunk/master
ec8d7bd Properly check for errors in PutItem and AddItem
f242b9e Merge pull request #18 from cvanderschuere/master
3fe5392 Fixed dynamodb table.DescribeTable()
58c5815 Merge pull request #12 from shopsmart/gofmt
ce524e3 Merge branch 'master' of github.com:crowdmob/goamz
fd5ff87 don't test gittip with travis
bfa553e gofmt all the things
456bffa Merge pull request #11 from shopsmart/cleanup_test_imports
ad8c462 Updating test import paths to full package paths and renaming export_test files.
d3398e2 sdb
9c62837 move export_test to work
c925ade update sqs to work with SecurityToken
33e765a relative path for s3 importing in test
4c9d5ee relative iam testing paths
da7afdf elb tests working
19e304c fix ec2 tests
5ca2780 fix ec2test/server.go imports
d453c0f fix difference in json Marshall escaping for go 1.1, fixing dynamo test
a781e21 update dynamodb tests to use Key
9076c12 fix compile error in bad branch
a6caae2 Merge pull request #10 from alimoeeny/patch-4
9cc10da Merge branch 'master' of github.com:crowdmob/goamz
cc06a16 replace . 'launchpad.net/gocheck' notation with plain 'launchpad.net/gocheck'
02fe019 Fixed a typo/bug introduced by myself
b8fce59 Merge pull request #9 from alimoeeny/patch-3
c1c330e added x-amz-security-token to presigned urls for s3
cea160d use token in s3 request
fc41d2d readme update and travis gets sqs
93d0f19 use gocheck.* syntax in all tests
5f7d1cf merge @hailocab and change imports to crowdmob
9f8bb81 merge @hailocab
563b350 go fmt
cd20c14 merge @lwlr branch
7d655e8 add options struct to s3 requests for SSE support @reedobrien
d99c710 add test for Head via @reedobrien
f512ae4 implements S3 HEAD request. via @reedobrien
c711f74 implement PutReader with metadata by @reedobrien +go fmt
c5784f9 trying to readd sqs as non-sub-module #2
b5171fd trying to readd sqs as non-sub-module #1
b6d660e Test suite fixes for s3
631c05d Set SecretKey and AccessKey explicitly now to handle optional token parameter in Auth
dcd2caa go fmt
c833a09 bugfix on s3 token from @alimoeeny
d6b3a14 merge https://github.com/Mistobaan/sqs
cca2e64 manual merge https://github.com/Mistobaan/sqs
c6c332a Merge pull request #7 from alimoeeny/patch-1
21e211b Merge pull request #8 from alimoeeny/patch-2
2c7137a If aws.Auth.Token is not empty add it to the X-Amz-Security-Token reqyest header
a210cda Added SecurityToken to aws.Auth to use with Temporary credentials when calling S3 api
3fa44f9 Get IP and private IP from an instance
d4dd8f9 Bump EC2 API version to a version that actually supports IAM profiles
82fb151 Fix duplicate import declaration
51fa731 Merge ec2-iam, replace IAM profile param as you can pass either Name or ARN
c3ccbfd Added IAM Instance Profile support
f090a6b aws: timeout on requesting metadata
3b79ec2 aws: make GetMetaData public
da0b314 Add instance based IAM role authentication
6ef7a23 Fix ELB test broken by previous refactor
6db8c56 Add a readme
58eaa90 Merge branch 'travis'
eeb72a5 And drop 1.0 as the tests fail ;)
b90ec91 Add 1.0 & tip back in as tested versions
ba57dce Build ALL the things. Separately.
d34ccd7 Override travis build to just build ec2. Current failures are caused by successive tests not tearing down http listeners
2c53d2f Add IamInstanceProfile params to RunInstances
715141c Merge branch 'refactor'
407f8d1 fixed string escape bug in marshaller
97a12d7 Rename RunInstances struct to RunInstancesOptions as it's the Options passed to AWS, and matches other RunInstances types
7243c23 Just build 1.1 until we've fixed all the tests
c99ee96 changed count type to int64
4cc613b removed simplejson fork dependency
ca56172 Fix gocheck import broken in 157673acf45e349ee5331bc3226ebabc10959efb which breaks a lot of S3 tests
b4c9d74 Remove more local imports for ELB tests
92615b2 Remove local imports from ELB tests
b1b2ece Add travis file
183eda8 Merge branch 'gofmt'
dc7cc12 gofmt all the things
8eab9ed added batchgetitem support
4b99f1b s/crowdmob/hailocab/ so we can use go get correctly
5499b07 fixed api version for query request
8ae8b1c added needed hashkeyelement attribute
2e05048 added needed hashkeyelement attribute
96f9c46 fixed ^
e8b70f3 fixed local secondary index queries
c928e3a fixed local secondary index queries
c393957 fixed local secondary index queries
93792c5 fixed local secondary index queries
9b1bc47 local secondary index queries
5d58c20 local secondary index queries

git-subtree-dir: src/github.com/crowdmob/goamz
git-subtree-split: f71626d5fd05d3c70f083b385a7e592e742a2c6b
Merge commit 'f682aa706595c74a94ec64c1e6348360dbb1032d'
Squashed 'src/github.com/dotcloud/docker/' changes from 4dcc0f3..863eebe

863eebe Merge pull request #2084 from makeusabrew/patch-1
3c5350b Fix help text for -v option
c52c95f Merge pull request #1876 from asbjornenge/master
85a5139 Added Dockerfile.tmLanguage to contrib
ad4b09c Merge pull request #1832 from dotcloud/26-default_r_flag
e594c78 keep -r, but default true
826aaa0 Merge pull request #1990 from modcloth-labs/more-tests-for-auth-registry-resolution
ff4f32d Fix #2017 Merge branch '2017-api-details'
462ac1e Merge branch 'hint-api-details' of git://github.com/cdunklau/docker into 2017-api-details
1332f40 Merge pull request #2015 from dsissitka/1927
a292c04 Merge pull request #2069 from philips/add-xz-to-runtime-dependencies
37c4513 Merge pull request #2060 from mastahyeti/patch-1
b584c21 Merge pull request #2063 from dhrp/doc-template-fix
c925073 Merge pull request #2073 from tianon/gentoo-no-more-1422-hack
9f0feaa Merge pull request #2065 from kyleconroy/fix_ping_endpoint
0f830aa Update ubuntu docs to use wget instead of curl
5f05cb4 Remove Gentoo install notes about #1422 workaround
4778039 Merge pull request #2066 from tianon/vendor-bump-kr-pty
b180770 Merge pull request #2014 from alexlarsson/allow_set_file_cap
4f5c2cb fix(hack/PACKAGERS): add xz utils as a runtime dep
c3acd9b Merge pull request #2047 from Thermionix/patch-1
cb21a40 Bump vendor kr/pty to commit 3b1f6487b (syscall.O_NOCTTY)
5025b4d Cleanup
509e25c Add/modified the canonical link to work with all /index/ links. Added style for "danger'
d517fd3 Fix Ping endpoint documentation
b4e1b8d Merge pull request #2058 from marcusramberg/patch-1
45bd52d Fix ironic typo in changelog
534a991 fix logo path
23015fa Merge pull request #1994 from metalivedev/1993-legalcontext
fb46d91 Update archlinux.rst
85b7769 Merge pull request #2051 from tianon/hack-dockerfile-refactor
fa44555 Merge pull request #2035 from dhrp/style-revamp
3e7c50e Merge pull request #2033 from metalivedev/1969-cherrypick-fixcommitformat
ccefe47 Add cleanup/refactor portion of #2010 for hack and Dockerfile updates
ff85031 Merge pull request #2039 from tianon/mkimage-centos
017ecef Merge pull request #2046 from dotcloud/2030-dockercfg_panic_err-fix
88f710f Update archlinux.rst
6496059 fix panic with wrong dockercfg file
bcce3cb Merge pull request #1995 from dotcloud/fix_attach_2
bbf644e Merge pull request #2025 from dotcloud/2020_add_dockercfg_doc
d89ce09 Add contrib/mkimage-centos.sh back (from #1621), and associated documentation link
e3e041b Changes to a new style for the docs. Includes version switcher.
0a35b1f Added more context.
74d54b9 Fix #1969 formatting, add information about multiline json
31fd118 Merge pull request #2032 from dotcloud/move-rm-to-client
b081a74 Merge pull request #2006 from jo-m/master
db869ec Merge pull request #1589 from unclejack/479-add_rm_support_to_docker_run
5371498 Fix the attach behavior with -i
ba10e28 Merge pull request #2009 from kyleconroy/master
f4855a7 add .dockercfg doc
22e7e10 automatically remove container via -rm
edd90d46 Clearly point at detailed docs
f435970 Merge pull request #1842 from dotcloud/split_stdout_stderr
cb18a6e Update docs + fix endian issue
ce05083 Fix copypasta errors
723de87 Move run -rm to the cli only
c22e377 Used tabs for alignment when I should've used spaces. Fixed.
3f0d007 Hint for Remote API doc details in header links
f8c9f11 Configured FPM to make /etc/init/docker.conf a config file.
80319ad lxc: Allow set_file_cap capability in container
818ec10 Fix Authorization headers
34e28cc Remove smart quotes. Add the X-Docker-Token header
792403f Add the X-Docker-Registry header and /v1/_ping endpoint
8f5c33d Enable SSH Agent forwarding in Vagrant VM, so one is able to clone repos from private git repos etc.
06c1f00 Merge pull request #2000 from tianon/deprecated-docker-latest-tgz
00b3acb Merge pull request #2001 from tianon/gentoo-tree
420ba9c Merge pull request #2004 from kencochrane/master
0f829bf fix the error message so it is the same as the regex issue #1999
1363de0 Merge pull request #1989 from alexlarsson/setsid
d06116d Update Gentoo installation documentation now that we're in the portage tree proper
595210a Replace deprecated upgrading reference to docker-latest.tgz, which hasn't been updated since 0.5.3
c9b916b Update VERSION to 0.6.3-dev
1e6370f Merge branch 'release'
a59a665 Merge pull request #1968 from tianon/hack-build-instructions
b048e9d Merge pull request #1983 from blissdev/patch-1
c000e6a revert removal of slash betwixt user/repo
aa3de0b Add several of the small make.sh fixes from #1920, and make the output more consistent and contributor-friendly, since release instructions already exist in release.sh
648d759 Merge pull request #1972 from dotcloud/bump_0.6.3
5c190fa Fix #1993: add explanation for export restrictions
03fe563 Merge pull request #1970 from dotcloud/cleanup-hack
edde4f5 Adding more tests around `auth.ResolveAuthConfig`
7447867 Merge pull request #1982 from modcloth-labs/spelling-fix-for-the-word-protocol
c1c74cb Container: Always create a new session for the container
17b7194 use su instead of sudo
15ad291 various command fixes
d6887b7 Merge pull request #1883 from tianon/mkimage-debian
1036287 Add a few tweaks and fixes to contrib/mkimage-debian.sh
a7db125 Minor spelling correction of protocoll -> protocol
f6c6482 Hack: correct typo in release checklist
30b759f Merge pull request #1973 from metalivedev/1969-formatfix
35ca35f Merge pull request #1975 from tianon/patch-1
a4067b1 Add @tianon to hack/MAINTAINERS
b0a49a3 Bump to version v0.6.3
6097644 Fix #1969 formatting, add information about multiline json
fa3837a Hack: update README
baff72b Update maintainer's manual: every change should be done in a pull request.
99377de Hack: update release checklist and reference it in REAMDE
0ef5bcb hack/MAINTAINERS.md: a maintainer's manual.
fd1c43f Hack: remove deprecated files
dc06496 Merge pull request #1967 from dotcloud/vendor-update-tar
cfbe76e Update tar dependency to newest version
2fafe1e Merge pull request #1948 from dotcloud/fix_attach
8240e37 Merge pull request #1820 from dotcloud/1647-api-group
23cf3c7 Merge pull request #1934 from dotcloud/host-permissions
2819cfb Merge pull request #1954 from metalivedev/1901-cherrypick-builddocker
a479f76 Merge pull request #1929 from tianon/gentoo-docs
b02a591 Merge pull request #1932 from jcassee/patch-1
c654075 Merge pull request #1901 from jalateras/update-contributring-docs
5a3dcbb Merge pull request #1952 from metalivedev/1909-cherrypick
cce6f00 Fix minor typo
4db6411 Merge pull request #1949 from dotcloud/1895-registry-regex
e97364e Improve detach unit tests
2bd089d Fix attach issue
a813937 Merge pull request #1889 from dsissitka/fixhttpimport
b45e280 Only copy files and change permissions with non bindmount
5867f9e Modify repository name regex to match index
6132f37 Merge pull request #1901 from jalateras/update-contributring-docs
3cf4b2c Updated the section about extracting the binary
d70cbbf Updated the section about extracting the binary
b7e7104 Updated the section about extracting the binary
7e60a6b Merge pull request #1932 from jcassee/patch-1
45979a7 Merge pull request #1929 from tianon/gentoo-docs
5c92132 Download Ubuntu 13.04 repository key over HTTPS
68074fc Merge pull request #1886 from dotcloud/multi-volumes-from
c42056b Merge pull request #1914 from tianon/base-repository-is-deprecated
341adde Simplify install instructions now that our overlay is in the official repositories.xml list, and add note about hacky #1422 workaround
4790429 Remove many remaining docs references to the deprecated `base` repository and several other minor doc cleanups
a18c263 Docs: remove reference to deprecated 'base' image
77ad95d Merge pull request #1913 from metalivedev/1654-registryexamples
fee6189 Update VERSION
f6a78f8 Merge remote-tracking branch 'origin/release'
081543c Merge pull request #1908 from dotcloud/bump_v0.6.2
4054f31 Updated the dev environment document
76a0737 Further updates to the  dev environment document
5d364fd Further updates to the  dev environment document
28311f6 Update the devenvironment document
70b7317 Updated the dev environment document
67453d6 Fix #1654 Improve the introduction to repositories flow.
c14450a Merge pull request #1909 from dotcloud/fix-typo-docs
5935664 Fix minor typo
ca5913f Bump version to 0.6.2
85f3ec8 Merge pull request #1893 from dotcloud/add-tianon-maintainer
b2707dc Merge pull request #1898 from dotcloud/smallfix_registry
b826351 Merge pull request #1897 from dotcloud/update_doc
5797e7e Further updates to the  dev environment document
089a60c Further updates to the  dev environment document
a99a838 Update the devenvironment document
dfd0dee packaging, issue #1647: Add docker groupname on the package release
2183644 Information about data persistence
e836b00 Prevent panic upon error pulling registry
986906c Merge pull request #1892 from dotcloud/fix-maintainers-files
8d48119 Merge pull request #1894 from dotcloud/1891-remove_useless_warnings
cdce873 Merge pull request #1896 from dotcloud/1885-missing-hostfile
5a01f74 Only mount hostname files if config exists
45b5073 Merge pull request #1849 from dotcloud/better_handle_hostConfig
40eaa82 Don't show network related warnings when networking is disabled
9946981 Add Tianon to contrib/ maintainers
d6cf41c Add MAINTAINERS
c6b4076 Fixed HTTP imports.
b79bd4e Allow multiple volumes-from
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
796d7a4 Update the commit documentation with better example
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
082d142 Add documentation
9dd98df Merge branch 'master' of https://github.com/dotcloud/docker
e854b7b Make StdCopy works with huge amount of data
289350e Add stderr unit test
8ae5348 Split stdout stderr for non-tty commands
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
f482432 improved hostConfig reload
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"
e893968 Merge pull request #1735 from dotcloud/1301-support-domainname
4f3b803 cruft removal
ebb934c line continuation regex
2801624 Merge pull request #1796 from shin-/api_1_5
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
58281b4 Merge pull request #1793 from reds/master
672f1e0 failing test case for multiline command in dockerfile
dd806b4 add Martin Redmond to AUTHORS
843f909 Merge branch 'filter' of https://github.com/reds/docker into reds-filter
53da050 Merge pull request #1837 from dotcloud/fix-tests-1812
bd847f6 rebase master
e503f6a Merge pull request #1825 from dotcloud/merge-builder-runtime
6678a26 gofmt
e37dcd7 Hack: use vendored dependencies in-place, for less moving parts when developing
8ddfb4d Merge pull request #1828 from mmikulicic/patch-1
28f2fe9 Merge pull request #1836 from srid/patch-2
3c90e96 remove docker-ruby from docs
46a1cd6 only os.Exits on error
9b088ad Merge pull request #1812 from dotcloud/return-run-exit-code
0508bd8 Merge pull request #1773 from hectcastro/hc-riak-example
446ca4b fix init layer
4f2e59f bind mount /etc/hosts and /etc/hostname
0a436e0 add domainname support
c66a827 Merge pull request #1807 from tianon/gentoo-docs
fe99e51 Created a little landing page for the examples, combined first two.
49b5c44 Merge pull request #1833 from shin-/1815-always-push-tags
64bc08f Push tags to registry even if images are already uploaded
2d4ac06 Merge pull request #1831 from brianshumate/jbs-docs-edits
9749d94 note about exiting from attachment prior to running
630ae43 improve sentence readabilty
268928a Please add go-dockerclient to docker API clients doc
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
eca861a Add missing package import
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
6a9f4ec Add missing comments to runtime.go
24e0204 Merge builder.go into runtime.go
c8f885a Merge pull request #1822 from dotcloud/remove_os_user
b07314e Remove import os/user
eed00a4 README: remove original shipping containers 'manifesto'. It's a little long to stay here.
6679f3b README: replace 'install instructions' and 'usage examples' with references to the website and docs
70ab25a README: harmonize intro with website
bcb8d3f README: refer to the docs for install instructions to remove duplication.
b9ca311 Update roadmap
37186d9 Merge pull request #1818 from metalivedev/655-searchswiftype
03a28da Add Swiftype search to docs
b44d113 filter image listing using path.Match
35bcba8 improve image listing
f2bc7eb Merge pull request #1777 from dotcloud/1620-index-test
8a2fd91 Merge pull request #1780 from shin-/1218-push-dependencies
f3d51bb Merge pull request #1810 from dotcloud/1798-inspect-fix
d06a0ba Merge pull request #1811 from dotcloud/672-remove_getcache
8374dac From FIXME: local path for ADD
3bc73fa Return the process exit code for run commands
0d70449 remove unused getCache endpoint
20a763e fix indent in doc
5ec2fea Detect images/containers conflicts in docker inspect
908bb65 Merge pull request #1803 from dotcloud/1802-skip-TestGetContainersTop
d368c2d Update Gentoo docs to reflect the package name change from app-emulation/lxc-docker to app-emulation/docker as discussed in today's #docker-meeting
82dd417 Reformat Gentoo install instructions to 80 columns
b57d7dc Merge pull request #1804 from Bouke/patch-1
8e41181 Merge pull request #1772 from dotcloud/update-tar-revision
fdf1fcc Fix memory recommendations (Byte, not bit)
bf6e241 testing, issue #1802: Temporarily skip TestGetContainersTop
f0cdbaa Merge pull request #1801 from vcoisne/master
e0d6bae Merge pull request #1789 from tommyblue/patch-1
d6ff912 Merge pull request #1797 from denibertovic/docs
ad04cac Add step to docker installation using vagrant (Mac, Linux)
62823cf fixed docs for installing binary
9ae5054 Bumped API version in api.go ; added <1.5 behavior to getContainersJSON
8878943 deployment, issue #1578: Avoid pinning kernel headers. Add Vagrantfile assumptions
8e3844c Merge pull request #1578 from jimmycuadra/vagrant-provider-detection
1a32c4a Merge pull request #1795 from eliasp/patch-1
98edd0e Updated docs for API v1.5
98a1314 Merge branch 'mhennings-1357-implement-login-with-private-registry' into api_1_5
34edbd4 Merge branch '1357-implement-login-with-private-registry' of git://github.com/mhennings/docker into mhennings-1357-implement-login-with-private-registry
2ea52dd Merge branch 'better_api_ports' of git://github.com/shin-/docker into shin--better_api_ports
396274f Typo
28e75b2 Don't install VirtualBox Guest Additions if VAGRANT_DEFAULT_PROVIDER is set.
ad5796d Adds instruction about UDP port redirection
3a6868b Merge pull request #1788 from dotcloud/1787-deprecate-port-forwarding
34145f9 deployment, issue #1787: Remove deprecated port forwarding from /Vagrantfile
58ea690 Merge pull request #1784 from proger/patch-1
3b92ab3 Merge pull request #1783 from briehanlombaard/typos
76f97a6 Merge pull request #1785 from thijsterlouw/update_commandline_cli
5974794 Merge pull request #1782 from tianon/gentoo-docs
368d038 Fix documentation index for cli
58ffd03 add new docker api client for erlang, erldocker
9ce1d02 Add Gentoo documentation
251d126 Fixed typos
a0a5170 Merge pull request #1449 from spkane/honor-ENV-VAGRANT_DEFAULT_PROVIDER
b3a70d7 Compute dependency graph and upload layers in the right order when pushing
91ee679 pr #1718: Fetch docker gpg over https
52fe452 Changed docker apt repo URI from https to http because the http driver for apt is not installed by default
8465241 testing, issue #1620: Add index functional test on docker-ci
fac4ced Add a Docker example for running Riak.
ded9732 Move auth header on run cmd
dd4aab8 Use base64 encoding
d04beb7 Pass auth config through headers rather than as URL param
a260347 Merge on current master
ad322d7 Send corrent endpoint authentication when an image is pulled during the run cmd.
da3bb9a Move authConfig to a Parameter on postImagePush, too
0e6ee96 Merge pull request #1603 from dotcloud/773-docker-ci-pr
fcee605 Login against private registry
ea813d8 Update tar pkg revision number
d13c2ed Merge pull request #1317 from calavera/login_signal
75df495 Merge pull request #1758 from mattapperson/patch-1
f703b8b Merge pull request #1771 from thijsterlouw/missing_cli_docs
6380b42 Add 2 missing cli commands to docs (events + insert) and alphabetically order docker output
ce53e21 Read the stdin line properly.
35fef27 Merge branch 'login_signal' of https://github.com/calavera/docker into login_signal
fa3266e Merge branch 'master' into login_signal
113bb39 Don't export Graph.walkAll.
1fca99a Replace Graph.All with Graph.Map
e42d3a1 Added NodeJS library
3528990 Merge pull request #1665 from dotcloud/ksid-contrib-maintainer
8ee4473 Merge pull request #1704 from dhrp/ubuntu-install-finger-fingerprint
212b582 Merge pull request #1673 from xdissent/1659-upstart-order
969e48d Merge pull request #1752 from dotcloud/1750-build_error-fix
d9b7ec6 Merge pull request #1754 from griff/1705_changelog_fails_before_run
46c9c5c Made calling changelog before run return empty. Fixes #1705.
7a9c711 Copies content from image to volumne if non-empty. Fixes #1582.
6756e78 Just fixing gofmt issues in other people's code.
84431ec Merge pull request #1613 from thijsterlouw/proper_resolvconf_parsing
d605e82 fix error in docker build when param is not a directory
2ea1923 Merge pull request #1744 from dsissitka/patch-7
df36f9d Merge pull request #1749 from msiebuhr/doc-from-tags
74982bd Merge pull request #1738 from jonasi/error-to-stderr
6d769f4 Merge pull request #1743 from dotcloud/fix_version
1a8a540 Document FROM <image>:<tag> Dockerfile instruction.
6c206f7 Install Ubuntu raring backported kernel from official archives directly.
110d3b7 Merge pull request #1736 from ramonvanalteren/patch-1
c0e95fa Updated "Use -> The Basics" to use ubuntu:12.10.
e3b58d3 hide version when not available
9b029a0 Merge pull request #1739 from dotcloud/add-docs-dockerfile
49d35cc Merge pull request #1690 from jbbarth/code-formatting
c6702be added a Dockerfile which installs all deps and builds the docs.
690c383 Merge pull request #1710 from thomasf/master
050cf70 Merge pull request #1721 from andrewmunsell/patch-2
df8f95a Merge pull request #1591 from dotcloud/1557_fix_docker_run_useage
0f91418 Merge pull request #1729 from dsissitka/patch-6
4ff649c Unable to find image error should print to stderr
c4394de Merge pull request #1717 from metalivedev/1685-updateinstallation
f159f47 remove message during tests
740a97f use init function
eee6d3d add TEST env var during tests and silenced parserun during tests
559724a Update python_web_app.rst
3f141e1 Update remaining upstart scripts to wait for lxc-net
9f8e5a9 Use flag.StringVar to capture the command line flags.
78d995b Fix syscall name.
e7ee2f4 Remove unused imports.
b8a8962 Simplify term signal handler.
b54ba50 Add the ISIG syscall back to not kill the client withing a shell with ctrl+c.
f18889b Print a new line after getting the password from stdin.
6e4a818 Exit if there is any error reading from stdin.
2357fec Stop making a raw terminal to ask for registry login credentials.
23dc52f Allow to generate signals when termios is in raw mode.
c3154fd Use a more idiomatic syntax to capture the exit.
f1d0625 Exit from `docker login` on SIGTERM and SIGINT.
230dc07 fix logo path
c46d993 Merge pull request #1727 from dsissitka/patch-5
bcb081a Merge pull request #1708 from nexxy/patch-1
5789236 Fixed a minor syntax error.
0752532 Fixed a minor syntax error.
f6b56e9 Updated "POST /containers/create" to return the right Content-Type.
18d572a Added Emily Rose to AUTHORS.
37a2369 Add privileged flag in documentation for container creation
c1f6914 Correct number of asterisks.
b1eae31 Fix #1685: Notes on production use. General installation cleanup.
a359e52 Added FIXME for iproute → netlink as advised in issue #925.
bf98fff Merge pull request #1674 from jbbarth/docs
e6c3da4 Merge pull request #1696 from daniel-garcia/1448-add_newline_every_logmessage
d5220bc Merge pull request #1711 from dotcloud/1709-start_doc-fix
66ef6c0 fix start doc
20772f9 Fix bash completion, remove have
9a60f36 Merge branch 'master' of https://github.com/dotcloud/docker
69a93b3 Update docker_remote_api_v1.4.rst
466a88b added apt-key finger tip and fingerprint in ubuntu installation page
f0620da Merge pull request #1703 from metalivedev/621-usebaseimages
dffb72c Fix #621: add new use/base images section. Include examples.
1288930 Merge pull request #1698 from metalivedev/1684-Cleanup
98018df More descriptive, easier to process container portmappings information in the API
4a3b039 Merge pull request #1694 from dotcloud/troubleshoot_windows_installation
c627ff6 Fix #1684: Old Welcome is now Introduction. Working with Repos now follows Builder. Clean up some doc build errors. Removed old Manifesto. Tweaked layout javascript to allow direct link from first and last index elements.
d593f57 write newline after every log message.
c2b273d Merge pull request #1611 from pysqz/master
cc18a9c Also reuse forwarding ports
f861c49 Troubleshooting windows installation section
d80b50d Improve formatting with 'go fmt' as stated in CONTRIBUTING.md
5b84252 Merge pull request #1622 from TylerBrock/patch-2
f352ec9 ENTRYPOINT fixups
714e424 Merge pull request #1656 from KSid/vagrantfile-0.6
f7fa6c2 Merge pull request #1671 from kim0/patch-3
b866254 Merge pull request #1636 from unclejack/1594-return_non_zero_when_encountering_error
108b6c6 Merge pull request #1678 from dotcloud/remove-incorrect-build-instructions
9ce7b1c Merge pull request #1663 from KSid/1661-cp-parsing-error
076434e Remove incorrect build instructions
f280704 Merge pull request #1670 from tobstarr/patch-1
d4c7340 Merge pull request #1646 from mohitsoni/master
331f983 Start docker after lxc-net to prevent ip forwarding race
1adbadd Add mercurial to the list of packages needed in a dev environment
843ef64 Don't force a non-existent npm version, use latest from epel
4440bde Change fetching of gpg key from http to https
f83d556 Make Kawsar Saiyeed @KSid the maintainer for contributed tools
d8a18ea Display error if resource not specified
c864647 Merge pull request #1658 from jamescarr/patch-1
2891e82 Merge pull request #1657 from KSid/bash-completion-0.6
465d531 Update for new mailing list
02d1d23 Add latest docker options to docker.bash
1f85ed6 Update Vagrantfile to use docker apt repository
ef82690 Merge remote-tracking branch 'upstream/master'
f4432d5 Refactored code and added unit tests
820a3b9 Merge pull request #1634 from songgao/patch-1
99a8306 Merge release 0.6.1 back to master
bd16107 Merge pull request #1648 from dotcloud/bump_0.6.1
5105263 Bump to v0.6.1
7b5c579 Use correct upstart script with new build tool
dcfb993 Merge pull request #1642 from dotcloud/upstart-exec
dd9ee03 Merge pull request #1633 from abhirajbutala/patch-1
15d658d Removed duplicate mercurial install command
59281d6 use libffi-dev, don't build it from sources
29be20f Fixed: ImagePull in runtime test
5a8c32d Use additional decorator in RequestFactory to pass meta headers to registry
3d9b437 Use correct upstart script with new build tool
ab882da Fixes #1643
e2594d1 Merge pull request #1641 from dotcloud/docs-0.6-gpg-key
ebb9b5e Added adding the gpg key
98f9d3e Merge pull request #1562 from AnSavvides/contributing-link
091fb89 Added line on top of ubuntulinux announcing change in 0.6
db91cac Merge pull request #1635 from unclejack/fix_main_dockerfile
8dd3607 Merge pull request #1563 from dotcloud/1073_add_loading_message
3ebda17 Merge pull request #1637 from dhrp/change-docs-ubuntu-sources
9149c45 Merge pull request #1627 from shin-/registry_metaheaders
969ab9c Merged 0.6.0 release back to master
588f8e1 Merge pull request #1628 from dotcloud/bump_0.6.0
f753dfe Updated the docs to reflect we no longer use Launchpad and host our own repository.
d1ad0e2 return error if at least one container fails to start
72cfa3d use libffi-dev, don't build it from sources
3396a18 Update docker_remote_api.rst
1c6af60 Fixed: ImagePull in runtime test
ccc2276 Merge pull request #1630 from KSid/docker-build-dockerfile
78a71b1 Merge pull request #1587 from dotcloud/1559_improve_version
2191419 Removed duplicate mercurial install command
f4a4f1c Bump to 0.6.0
f925edd Merge pull request #1525 from griff/1503-fix
12715c8 Merge pull request #1609 from jpetazzo/release-docker-with-docker
093b85b Use additional decorator in RequestFactory to pass meta headers to registry
326dadd Merge pull request #1565 from dotcloud/only_load_authconfig_when_needed
a3510c9 Merge pull request #1560 from dotcloud/439-allow-lxc-args
262d57e Merge pull request #1623 from mhennings/1592-fix-race-conditions-in-parallel-pull
551092f Add lxc-conf flag to allow custom lxc options
3f802f4 Fix race conditions in parallel pull
d6f5304 Some fixes for MongoDB example
5e33864 testing, issue #773: Add infrastructure docker-ci PR documentation
0b9c8e2 Merge pull request #1596 from metalivedev/1149-easyfixes
42fe550 Merge pull request #1614 from denibertovic/docs
f5bd137 Add mongodb example
348696f Merge pull request #1607 from TylerBrock/mongodb
6da0719 Merge pull request #1513 from dotcloud/add_user_dockerfile
56e02dd Merge pull request #1588 from dotcloud/1561_fix_warning_in_tests
e0a7013 Merge pull request #1576 from MatthewMueller/patch-1
467dbb7 small fix to docs regarding adding docker groups
2f6ce27 Make sure 'Ghost' container is available with allocated IP
c349b4d Keep linebreaks and generalize code
62e8478 proper resolv.conf parsing
2150949 update help
8a7c049 Remove -x flag — we do not want to be *that* verbose.
885afeb Bump up VERSION file to 0.5.3-dev
e06372d Update packaging/README to point to hack/release
b5a48ea Moved release scripts to hack/release and updated instructions.
a805905 +CHANGES is now -dirty (works better in URLs), and we have postinstall and prerm jobs.
c8c69a1 Bump to 0.5.3 (VERSION file)
0469e47 Release script also takes care of index file (if the S3 bucket is WS-enabled)
5b630d4 If there are changes, add the timestamp to the package version.
9c06420 Implement apt-secure repository signing.
8787200 Repository should also have i386 index, since Ubuntu is multi-arch by default
abfa7a2 Update to go 1.1.2.
5b0eaef Run reprepro from release, incrementally (it needs S3 credentials). Add virtual package.
9694fb8 Install python-magic (it helps s3cmd) and a convenience /src symlink
bfee2c7 Polish instructions a little bit.
ab4fb9b Add a check for S3 bucket access.
fbd5b20 Running the build image will now execute release.sh automatically.
ff30eb9 Protect the release.sh script against accidental use. Infer VERSION automatically.
749a7d0 Add a check to make sure that make.sh only runs within a container.
d9f7699 Cosmetic changes: rewrapping, `` → $()… before starting the real work
d750060 add "|| true" otherwise "set -e" kills us if the repo is clean
bdbac9f Upgrade Dockerfile with new dependency
1320177 Update release checklist. Still needs work.
ccc3969 release.sh: publish a full release of docker to a S3 bucket, including static binary and a full APT repository with install instructions
89ee524 Good-bye, ugly mega-Makefile. Docker can now be built with docker, with the help of a simple very simple shell script.
9fce6f6 docker -v: show version and build information without making remote connections
9087ef9 Move VERSION to a dedicated file to facilitate automated builds and releases
aa2ab51 Deprecate dockerbuilder in favor of a standard Dockerfile
2c147dd add mongodb image example
ee64e09 testing, issue #773: Automatically test pull requests on docker-ci
30726c3 Improve docker-ci deployment and tests
41973d4 fix typo
f69c465 rebase docs
75f4fd9 Fix #1330 and #1149. Improve CMD, ENTRYPOINT, and attach docs.
e9a1246 Enable mobile view for website.
d627ff9 Merge pull request #1590 from elmendalerenda/patch-3
04c16f3 Merge pull request #1396 from calavera/985-ordered-api-images
9c829cb Merge pull request #1581 from mhennings/workdirsupport-buildfile
83acd37 fixed postgresql conf setting
b21f898 assume ip_forwarding = 1 by default
646afab improve version
f6653c3 Merge pull request #1553 from dotcloud/1540_fix_error_message
18962d0 load authConfig only when needed and fix useless WARNING
b22c973 Added escape sequence to tutorial
3199883 Add workdir support for the Buildfile
67c9ce6 Merge pull request #1459 from mhennings/set-working-directory
687d27a Add an option to set the working directory.
6aff117 Use flag.StringVar to capture the command line flags.
e69f714 Fix syscall name.
276d2bb Remove unused imports.
e6affb1 Sort images by tag name when the creation date is the same.
f409c11 add to cli
3885ee0 Merge pull request #1575 from evanphx/tags
5325703 updated default
45543d0 Simplify term signal handler.
8a18999 Add the ISIG syscall back to not kill the client withing a shell with ctrl+c.
07a8870 Show tag used when image is missing
1843a71 Merge pull request #1550 from dotcloud/update-dependencies-in-readme
9ce5777 Merge pull request #1572 from dotcloud/1431-disable-TestContainerTop
422d4af testing, issue #1431: Temporarely disable TestContainerTop from the testsuite
09a08e0 Merge pull request #1569 from TylerBrock/patch-1
5142e83 Merge pull request #1473 from shin-/978-opaque-v2
0418702 registry: removing opaqueRequest
674e5c8 remove extraneous step and stupid whitespace
2ec141d Add instructions for creating and using the docker group
20b1e19 add loading message
f11fb70 Adding direct reference to contribution guidelines
bca19a2 Update readme with dependencies for building
62b45f0 fix can't connect message  with socket
92a2b63 Merge pull request #1551 from dotcloud/hotfix_parallel_pull_display
d7979ef hot fix display in parallel pull and go fmt
c5d8844 Merge pull request #1495 from bdon/master
c7cda86 Don't read from stdout in hijack unless attached. Fixes #1503
4caa604 Merge pull request #1549 from dotcloud/fix-logevent-tests
7f9ba14 Add imagename to LogEvent tests
72660a1 Merge pull request #1537 from metalivedev/1517-sudodocker
d4eab77 Fix #1517, #1521 by adding sudo to examples and installation.
9708597 Merge pull request #1538 from KSid/bash-completion-limit-containers
15bc224 Merge pull request #1505 from dotcloud/improve_events
631c449 Merge pull request #1496 from xdissent/1351-volumes-from-before-volumes
84a0274 Merge pull request #1249 from unclejack/507-add_sigterm_sigint_handling_to_docker_run
5ad8840 Merge pull request #1541 from dotcloud/1528-fix_panic
8dfc473 Merge pull request #1543 from dotcloud/fix_rmi_parse_repo_tag
aae04de Merge branch 'master' of https://github.com/dotcloud/docker
f51eb0e Merge pull request #1546 from dotcloud/1542-coverage-dependencies
8b6b187 Merge branch 'master' of https://github.com/dotcloud/docker
8b26e4e brew: docker-py requirement points to git repository
1d8562b testing, issue #1542: Add docker dependencies coverage testing into docker-ci
9662f9e Merge pull request #1478 from jpetazzo/929-insecure-flag
25d71fb Merge pull request #1509 from dotcloud/1359-tar-pkg-ref
12ffb52 Merge pull request #1519 from shin-/brew-more
0077678 Merge pull request #1539 from fkautz/https-install-script
53f2c5d Merge pull request #1545 from dotcloud/1544-docker-ci-dependencies
49597f0 testing, issue #1544: Add new docker dependencies into docker-ci
c84d74d add missing ParseRepositoryTag
3c9f994 prevent crash when .dockercfg not readable
80ebff0 Install script should be fetched over https, not http.
62c0f43 brew: Fixed a bug with remote repository builds
44eb1b3 Limit commands to containers of a relevant state
4cb57a5 Merge pull request #1533 from dhrp/docs-ux-changes
2e56424 Merge pull request #1523 from dotcloud/docker-group-docs
4947e32 Merged 0.5.3 hotfix release back to master
6c87db9 Resolved conflict in conf.py
f127c47 Merge remote-tracking branch 'dotcloud/master' into docs-smart-changes
280901e add -insecure flag and relevant tests
f14db49 [docs] Some user-friendly changes to the documentation.
f1cdba2 Merge pull request #1516 from unclejack/up_hack_dockerfile_go_version_to_1.1.2
0794f0b Merge pull request #1526 from metalivedev/1522-faqupdate
e2409ad Added information about Docker's high level tools over LXC. Formatting cleanup. Mailing list cleanup.
ca92bc7 Merge pull request #1501 from KSid/vagrant-dev-dockerfile
e4f35dd Update docs for docker group
2cebe09 brew: Display a clear error message when the path is invalid
e5f1b6b brew: Updated requirements
79fc90b brew: Don't build if docker daemon can't be reached
fb7c421 brew: Reuse repositories when possible
06a092b Merge pull request #1510 from dotcloud/bump_0.5.3
5d25f32 Update changelog to include hostname commit
1a1c895 Fix TestEnv
05219d6 Add hostname to the container environment.
9cc3d7a Merge pull request #1515 from dotcloud/rework_auth_push
e09863f use Go 1.1.2 for dockerbuilder
2ba1300 remove checkIfLogged
6cb908b fix merge issue
5ee3c58 Add USER instruction
c377374 Bump to 0.5.3
0ca133d Handle ip route showing mask-less IP addresses
6893487 Make sure ENV instruction within build perform a commit each time
ef1d1ae Revert "docker.upstart: avoid spawning a `sh` process"
c015d26 API, issue 1471: Allow users belonging to the docker group to use the docker client
f6760fc Merge pull request #1485 from dotcloud/1471-unixsocket-group
ec61c46 Add import for dotcloud/tar to replace std tar pkg
90cb66f Merge pull request #1508 from pborreli/typos
999a8d7 API, issue 1471: Allow users belonging to the docker group to use the docker client
13acf72 Merge pull request #1504 from zaiste/docs/postgresql-service
aa213b4 Merge pull request #1488 from KSid/336-bash-completion
9b2a596 Fixed typos
1110bb8 Merge pull request #1476 from dotcloud/improve_TestKillDifferentUser
168e2f8 Merge pull request #1491 from titanous/gitignore-test
86ef642 Merge pull request #1487 from titanous/maintainer-usernames
3af60bf fix/docs: ubuntu instead of base, note about root-only
123c804 Added docs
edba1af Merge pull request #1494 from KSid/typo-docs-run-command
875e16c Merge pull request #1499 from seldo/master
703905d ensure the use oh IDs and add image's name in /events
d52c149 docs/postgresql: PostgreSQL service on Docker example
3f95d1b Merge pull request #1497 from vincentbernat/fix/ipv4-forwarding-detection
def9598 Install websocket library before building docker
529ee84 Adding a reference to ps -a
64b817a runtime: correctly detect IPv4 forwarding
02b8d14 Add test case for Graph ByParent().
025c759 Fix Graph ByParent() to generate list of child images per parent image.
940d588 Merge pull request #1483 from titanous/update-authors
a2fb870 Fix typo in docs for docker run -dns
e737856 Still missed -entrypoint from 'docker run'
ae1909b Clarified bash completion limitations
d75282e Missed -entrypoint from 'docker run' options
cd9886f Merge pull request #1489 from dotcloud/1422-revert-upstart
a43bae4 gitignore all test files
91ae135 Add description and usage information
57b49ef Skip existing volumes in volumes-from
3bd73a9 Apply volumes-from before creating volumes
e3acbff Revert "docker.upstart: avoid spawning a `sh` process"
d6e5c2c Add initial bash completion script
4dc04d7 Add GitHub usernames to MAINTAINERS
3e12349 Merge pull request #1484 from titanous/use-range
7c50221 Use ranged for loop on channels
3d63087 Merge pull request #1481 from titanous/fix-sprint
1408f08 Update AUTHORS
3b23f02 Fix typo: fmt.Sprint -> fmt.Sprintf
fd5099c Merge pull request #1479 from jpetazzo/fix-testbindmounts-typo
68b09cb fix typo in TestBindMounts (runContainer called without image)
92cd2f5 Merge pull request #1146 from benoitc/feature/attach_ws
8d1cd63 Merge pull request #1460 from dotcloud/patch1
2c4c10f Merge pull request #1477 from kevinclark/builder-fixme
722d4e9 Add myself to AUTHORS
4ff649a Only count known instructions as build steps
641ddae add formatting directive to failure to stop container error
2ba5c91 minor cleanup for signal handling
25e7227 Merge pull request #1462 from dotcloud/fix_build_events_output
04cd0a3 Merge pull request #1463 from jpetazzo/https-get-docker-io
db9d68c Improve TestKillDifferentUser to prevent timeout on buildbot
88cb9f3 keep processing signals after the first one
55f9610 Merge pull request #1452 from dotcloud/improve_TestGetContainersTop
6178dc7 brew: added safeguards in script and changed default branch to 'master'
b8f8f9d Merged 0.5.2 hotfix release back to master
1643943 Merge pull request #1464 from dotcloud/bump_0.5.2
e99a99e Bump to v0.5.2
df9712f Change daemon to listen on unix socket by default
28d3862 Merge pull request #1417 from crosbymichael/root-socket
1ce9b3c switch from http to https
5c56b59 change network range to avoid conflict with EC2 DNS
f712e10 Forbid certain paths within docker build ADD
213365c fix docker build and docker events output
7f02bd3 Merge pull request #1361 from dotcloud/library
ceb3381 Improve TestGetContainersTop so it does not rely on sleep
18fc707 Make sure all needed mountpoint are present
c3027fa Merge pull request #1216 from dotcloud/add_some_tests
4249867 rebase
c804a5f rebase master
be77ee3 Merge branch 'master' into add_some_tests
5928ed5 Merge pull request #1456 from dotcloud/1455-force_commit_build_env
075d30d Mount /dev/shm as a tmpfs
6a6a2ad Make sure ENV instruction within build perform a commit each time
279fe14 Merge pull request #1420 from jpetazzo/fix-get-docker-io-upstart-script
cc80bd4 Merge pull request #1423 from krautcomputing/fix_indentation_in_vagrantfile
06183e6 Merge pull request #1447 from kermit666/image-tag-doc
6249cc3 Merge pull request #1425 from dotcloud/simplify_ProgressReader
80f34c6 Merge pull request #1451 from dotcloud/michael-maintainer
a2f526d Merge pull request #1435 from jpetazzo/userland-proxy-should-listen-on-inaddr-any
429d2f8 Merge pull request #1445 from dsissitka/host
2ca018b Merge pull request #1395 from c00w/490-warn-ipv4forwarding-disabled
3e6e08c Merge pull request #1362 from dotcloud/registry_test
3e491f8 Fix reversed IPv4Forwarding check in api.go
ccffa69 Add Colin Rice to AUTHORS file
10190be Add warning when net.ipv4.ip_forwarding = 0
65a4e30 Merge pull request #1093 from monnand/910-login-info
e63960c Merge pull request #1450 from dotcloud/add-sandbox
e2ca600 Merge branch 'feature/attach_ws' into feature/attach_ws2
4860df1 Add Michael Crosby to core maintainers
ced93bc Modify test to accept error from mkContainer
0e21de9 Assume that if VAGRANT_DEFAULT_PROVIDER is set we shouldn't install vbox tools
3104fc8 Forbid certain paths within docker build ADD
2409df9 Merge pull request #1434 from jpetazzo/fix-ec2-dns-conflict
2e37be9 Merge pull request #1436 from jpetazzo/fix-loopback-interface-test-index
6115348 doc: syntax to run a specific image tag
416d098 Updated my last commit to use tabs instead of spaces.
6bbe66d Updated the Docker CLI to specify a value for the "Host" header.
3782e34 Merge pull request #1430 from metalivedev/1031-linuxheaders
84790aa relax the lo interface test to allow iface index != 1
fea2d5f Let userland proxy handle container-bound traffic
9f1c968 change network range to avoid conflict with EC2 DNS
e0a6f27 Suggest installing linux-headers by default. Address #1187 and #1031
9130ee7 Merge pull request #1428 from dhrp/twitterhandle
65c8e92 brew: added support for push on private registries.
1d654f6 changed the twitter handle
4af24e1 Merge pull request #1221 from crosbymichael/cmd-cp
583f586 Move copy command docs to api 1.4 document
d94b186 Strip leading forward slash from resource
5b8cfbe Add cp command and copy api endpoint
0dbc51f Merge pull request #1394 from crosbymichael/1391-json-requests
754ed90 Use mime types to parse Content-Type
ba17f4a fix small \n error un docker build
b9149f4 Fix indentation in Vagrantfile
b6c4b32 Merge pull request #1406 from dotcloud/1363-reduce_timeout-fix
965de6e fixing #910
3034901 Added index address into APIInfo.
c7c2399 Merge pull request #1421 from dotcloud/fix_makefile
120a520 Make sure all sources have the wanted revision
7c03bd1 Merge branch 'docs-example-fix' of git://github.com/faizkhan00/docker merges #1402
049d288 fix the upstart script generated by get.docker.io (it was not starting dockerd on boot)
8934f13 Change daemon to listen on unix socket by default
dcf9dfb Update utils_test.go
7c9604e Merge pull request #1387 from joevandyk/patch-1
b302ae3 Merge pull request #1418 from dhrp/remote_api_doc_improvements
ff6b6f2 Fixed some typo's and formatting issues in remote api documentation.
d49f141 Merge pull request #1303 from dhrp/update-spinx-for-man
590fc58 Update version.
c03561e Update CHANGELOG.md
4179f25 fixed #910. print user name to docker info output
e54e8fa Merge pull request #1290 from dotcloud/parallel_pull
2f1c05d Merge pull request #1374 from dotcloud/steeve-patch-1
baa4618 Merge pull request #1390 from grobie/clarify-amazon-documentation
dcc1e35 Merge pull request #1404 from dnordberg/fix-base-refs
f6fa353 Merge pull request #1267 from sridatta/new-clean-init
d4fa619 Merge pull request #1411 from andrewmacgregor/doc-typos
8a851af Merge pull request #1364 from dotcloud/bump_0.5.1
8aa9985 Adapted tests to latest registry changes
2c85b96 Cleanup
9159c81 Mock access logs don't show up in non-debug mode
484ba4a gofmt
97b7b17 New registry unit tests remade from scratch, using the mock registry
29f6921 Mock registry: Fixed a bug where the index validation path would return a 200 status code instead of the expected 204
553ce16 registry: Fixed a bug where token and cookie info wouldn't be sent when using LookupRemoteImage(). Fixed a bug where no error would be reported when getting a non-200 status code in GetRemoteImageLayer()
310ddec Disabled test server in the tests
6926ba5 Mocked registry: Added X-Docker-Size when fetching the layer
97d1d6f Fixed mocked registry
5f7abd5 Implemented a Mocked version of the Registry server
946bbee rebase master
bdc0e8f Merge pull request #1405 from jonasi/entrypoint-noargs
1b08ab9 Merge pull request #1408 from dotcloud/1407-localhost_is_a_domain-fix
feda3db Merge pull request #1382 from monnand/650-http-utils
ce97a71 Minor typos found while reading docs
d00fb40 added tests for 1405
0f249c8 fix entrypoint without cmd
a37b42b Merge pull request #1400 from gorsuch/doc-typo
dd8c598 Merge pull request #1182 from dotcloud/change_build_usage
a97cf23 add docs
030cc8d Merge pull request #1389 from dotcloud/1373-improve_checklocaldns
c22f261 Always consider localhost as a domain name when parsing the FQN repos name
c860945 Reduce connect and read timeout when pinging the registry (fixes issue #1363)
51d0c92 'Base' is depreciated and should no longer be referenced in the docs.
22df124 bash commands while in the container aren't in the transcript! Added.
bdaa87f Print a new line after getting the password from stdin.
db0ccaa typo: s/connexions/connections
4089a20 Exit if there is any error reading from stdin.
75ac50a Stop making a raw terminal to ask for registry login credentials.
58e0c68 Merge branch 'master' into login_signal
cd6aeaf Sort APIImages by most recent creation date.
708cd34 Clarify Amazon EC2 installation type
3e9575e Consider empty /etc/resolv.conf as local dns + add unit test
b6bff0c Update amazon.rst to explain that Vagrant is not necessary for running Docker on ec2
7bade49 update auth_test.go
5bc344a factory generated from one place.
4bd287e auth with user agent
6a56b7b Server now use request factory
7dac26c reqFactory in Registry
793fd98 http utils
f5a8e90 Make sure the routes IP are taken into consideration + add unit test for network overlap detection
2e7df51 testing, issue #1331: Add registry functional test to docker-ci
2e72882 Handle ip route showing mask-less IP addresses
ad3b091 Some more improvements on the docs readme. Removed references to website.
26229d7 Updated docs README with instructions to preview the generated manfile, and where to get the one generated by sphinx.
3b89d13 Bump to v0.5.1
1086355 rebase master
6166380 rebase master
46f59dd add parallel pull to 1.4
e1fa989 rebase master
bb06fe8 Allow to generate signals when termios is in raw mode.
7cc90f2 Use a more idiomatic syntax to capture the exit.
01ce312 Exit from `docker login` on SIGTERM and SIGINT.
f4b63d9 Enabled the docs to generate manpages.
12d575a Script cleans up downloaded repos, uses quiet build
01e98bf fix errors
f1dd299 Use VT100 escape codes :
94053b4 Brew: Added cache prefilling and build summary
77ff537 Brew: Fixed docker-py requirement
362f173 Brew: Avoid duplicate commands, added --debug option, added local repo support
7813f2a Updated git repos for precise and raring
3781a2c Added definition file for busybox and updated ubuntu
d47df21 Add brew script to the contrib folder
0ac672f Use full hash references in library/
c19fa83 Use extended syntax (indicate what type of object needs to be checked out)
844a9ab Define tags in the library files instead of upstream
a454902 Adding Joffrey as library maintainer
b06f627 Library: hipache and ubuntu base
8742649 improve client output
0e71e36 Add ID to JSONMessage in pull Use goroutines to pull in parallel If multiple images pulled at the same time, each progress is displayed on a new line
066873e rebase master
945033f change permissions of initLayer to be readable by non-root users
df86cb9 make docker run handle SIGINT/SIGTERM
5d8efc1 + Runtime: inject dockerinit at /.dockerinit instead of overwriting /sbin/init. This makes it possible to run /sbin/init inside a container.
1a226f0 add VolumesFrom to MergeConfig, and test
7c00201 add Volumes and VolumesFrom to CompareConfig
2db9944 prevent any kind of operation simultaneously
48a892b Add CompareConfig test
fb005a3 add server.ContainerTop, server.poolAdd and ser.poolRemove tests
d639f61 reuse the type
a3b1a9f useless function. forgot to remove it.
507cef8 useless type
166eba3 put the websocket route in the map containing all routes
fc3a8e4 change tag -> repo name in build usage
8eeff01 add websocket support to /container/<name>/attach/ws

git-subtree-dir: src/github.com/dotcloud/docker
git-subtree-split: 863eebe7bd7d5f9ac9f49619643078ea540154ff
Merge commit '1a680103599a91e31f405843277b15435fa75732'
Squashed 'src/github.com/globocom/gandalf/' changes from 160cea9..b04d566

b04d566 user: convert ParseAuthorizedKey result to use in MarshalAuthorizedKey
2f98d8b user: accept - and + on username
718b18c misc/setup: moved from setup dir
2ac28b8 user/key: storing current time on key creation

git-subtree-dir: src/github.com/globocom/gandalf
git-subtree-split: b04d566eafcece4dc1efb023fe483bbb6452b7b2
Merge commit 'a9bd497f5f342a9ccd0dd94ab5160c438b10cc7a'
Squashed 'src/github.com/globocom/tsuru/' changes from 018c1a8..6a246cf

6a246cf add the correct ubuntu version in the example giving
db9510c fix the procedure to install mariadb into a ubuntu 13.04
59ddd28 juju: implemented unreachable.
c4da973 juju: refactored unitStatus.
9d3451d juju: implemented IsReachable.
d826e30 juju: added test for unreachable on 502.
c0f1ffd juju: initial code for IsReachable.
e61bc41 juju: initial code for IsReachable.
e3f0aa7 juju: moved collector tests to collector_test.go.
db8415c juju: moved collector code to collector.go.
c86c604 docker: changed collector behaviour.
495c6c6 docker: refactoring collector logic.
0012dcd provison: added comments about unit status.
d133389 app: using StatusDown instead StatusError.
249cb62 juju: using StatusDown instead StatusError.
bc7362d provision/docker: provide parameter "user" CreateContainer call
585d474 provision/docker: remove sudo -u from deployCmd
7792751 docker: using StatusDown instead StatusError.
c390fba go fmt ./...
514f727 provision: removed StatusInstalling.
9ebeede provision: removed StatusCreating.
4a0e883 using state.String() instead string(state).
88b0995 docker: making IsReachable public.
2da3301 provision: removed StatusPending.
eafd458 juju: using building instead pending.
7867f36 collector: using building instead pending for tests.
38aac8e api: using building instead pending.
f89126b app: added tests for StatusBuilding.
3d3220f app: added StatusBuilding in the UnitPriority method.
6fc14b7 app: "building" is the unit default state.
c6050b9 provision: added status for building.
38c7513 provision/docker: extract collector tests.
1ebb77a provision/docker: fix calls to StartContainer
e230fe0 auth: support unauthenticated SMTP servers on sendEmail
4403712 api: fix bug in teamUserAdd
68e3328 provision/docker: moved collector code to collector.go.
5594325 api: don't remove all teams from Gandalf
ad59eba auth: move User.AllowedAppsByTeam to Team.AllowedApps
92afb92 auth: improve Team.RemoveUser
3df1fe2 docs: improved index.
e6abb07 docker: initial code for isReachable.
60016d9 provision: added StatusUnreachable.
59d98a6 provision/juju: use db.Collection instead of mgo.Collection
9a9dc54 provision/docker: make sure tests always close connection copies
e244bc1 router: use db.Collection instead of mgo.Collection
37060ff db: use Collection instead of mgo.Collection
5b0f534 db: introduce the type Collection
65da9af provision/docker: always copy the database connection in tests
2b46aad provision/docker: get IP from docker to execute commands
5626c93 auth: use copy of connection in TearDownSuite
ad889ce provision/docker: move the agentPort function
cec35d6 db: remove the maxIdleTime thing
c458e01 including a session with a better explanation of howto install a dns server integrated with tsuru
0137737 Adding a Howto documentation about using a DNS server integrated with tsuru
a794e59 provision/docker: use WaitContainer instead of flooding docker API
5facc9d adding howto install docker images and a link of howto install a mysql service step-by-step
6c5cd4c fix some tsuru configurations
a2737b3 Merge branch 'master' of github.com:globocom/tsuru
4f41bb1 fix some environment needed by mysql
1ced60a docs/quickstart/python: update informations about hooks
392250b docs/quickstart/ruby: improve wording
087e39d docs/css: bigger font
cdd0c4c quickstart/ruby: update hooks information
f1c12e9 docs/overview: fix reference to hooks page, and update terms
3452e24 docs/apps/client: remove hooks docs from wrong place
959f117 docs/app: add docs for deployment hooks
ad5ce60 auth: copy the connection for use in test
b37783e provision/juju: always protect execut with the mutex
31a7870 docs/services/mysql: fix year in copyright banner
d515e6c provision/docker/flatten: formatting
7585b61 provision/docker/flatten.go: logging when flatten succeeds
d99cb49 provision/docker/flatten.go: logging flatten attempt
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
a5b4686 adding centos as a valid platform for tsuru with docker
cd37d9e adding centos as a valid platform for tsuru with docker
1261c24 Update index.rst
6aceec4 removing AUFS fix from the documentation as it was solved here: https://github.com/sciurus/docker-rhel-rpm/issues/2
6c1fce5 some fixes in the documentation, the install script and tsuru-docker.conf
e343c7b docs/apps/quickstart/python: updating git remote url
c78e4bc provision/docker/flatten: filtering images that needs flatten
d2df063 tsuru-admin: unexport logRemove.
1203c9a tsuru-admin: registering log-remove.
d07bdb5 tsuru-admin: implement log-remove.
3354182 tsuru-admin: added info about log-remove cmd.
7e73b24 fix link format
e36b89e fix link format
7720681 fix some steps in docker install session
007c5ce fix Tsurus Dependencies session
8e9dcb9 fix doc format
943d249 addinng howto install docker + tsuru on centos
abe893b api: use auth.CreateTeam
f09b3ca auth: add CreateTeam function
809d268 cmd: don't strip leading slashes on writeTarget
b820fc4 docs: fixed navigation.
70ed530 api: fixed url for log in tests.
32ac144 api: added router for remove logs.
578904d api: remove log by app.
fe343ef api: added handler to remove logs.
e74e6dd apps/log: remove log by app.
a281f3e log: remove logs.
45d6ff1 contributors: added the one line for the magno emails.
fbada86 docker: using -q to ignore ssh warnings.
7060d49 docker: ignoring the ssh warning.
a8aaf26 cmd/tsuru: bump to 0.8.4.
d178867 router: returning error when the backend is not found.
fac03ff juju: using router swap.
a3c3113 docker: using router Swap.
e1e7ccb router: fixed the fake router behaviour.
ada3e64 router: storing the backend name.
fdcbc50 router: implemented swapBackendName.
bfa1628 Merge branch 'master' of github.com:globocom/tsuru
2c3ce5e adding how to extend an application
830cc2f router: refactored swap.
f2c9a57 router/hipache: implemented swap.
8189271 app: return empty list instead of nil on LastLogs
625fd41 fixed Sprintf pattern.
a013553 go fmt.
d3964b8 routes: implemented swap for elb.
eaf4adb router: simplified the import.
f5f246f router: added Swap method.
5e407a6 router: implemented retrieve.
6ef2595 router: implemented remove.
e71aabd router: implemented store.
0905027 router: using gocheck.
578443f cmd: implemented run --once.
3179285 api: added support for run commands once.
e810a4e app: added support for run once.
e86fd3e app: added once parameter in source and run methods.
8c8a75e app: added once parameter in Run.
554f705 fs/testing: use atomic ops to prevent data races on FakeFile.current
9359c4e provision/docker: prevent nil pointer dereference on error stream
a87f6e7 app: fix some bugs in LogListener
dfce60a docker: implemented ExecuteCommandOnce.
c8f485e juju: refactored ExecuteCommand and ExecuteCommandOnce.
ce68474 juju: using startedUnits in ExecuteCommandOnce.
e736414 juju: implemented startedUnits.
ea3bbdb removed comments.
09314f3 juju: implemented ExecuteCommandOnce.
8f8d47b fixing a typo
3b115a6 contributors: adding magno torres
7244ddc Update index.rst
cefa58a Update quickstart.rst
d211969 fixing the format in the session Listing dependencies
c59eba7 fixing the format in the session application code again
11cf73b fixing the format in the session application code
a6f7ad1 Merge branch 'master' of github.com:globocom/tsuru
24fb0b0 Adding documentation of how Deploying PHP applications in tsuru
7674cea provision/docker: also remove image from the registry server
e925956 api/app: incrementing app.Deploys field on deploy api endpoint
c3b864a app/app: adding Deploys field to track deployment number
a2b5ff8 provision: added ExecuteCommandOnce method.
6923079 removing pre/post restart login from tsuru.
3e3e6e0 iprovision/juju/healer_test: fixing return mismatch
e7b0732 heal/healer_test: removing commented import
50ea9f0 api/heal.go: removing comment
4abaf5a provision/docker: fix call to docker-cluster.PushImage
d3f94cc api: passing provisioner name to heal stuff
ca91f6f provision: migrating existent healers to use new interface
d52dd1a heal/healer: storing healers per-provisioner
b62e8f8 provision/docker: fix bug in push error checking
3d10323 provision/docker: use the ssh server instead of ssh-keygen -R
4cc1761 provision/docker: implement the removeHost method in the container
be83b51 provision/docker: add another handler to the ssh agent
639adcd contributors: added cezarsa.
475f850 juju: added more logs on execute commands.
af48d07 provision/docker: go fmt
3ba62eb provision/docker/healer.go: calling dCluster function instead of using global variable directly
0b7fabe provision/docker/healer.go: logging attempt to heal container
1a0af98 provision/docker/docker.go: initalizing cluster node slice.
fcc86af provision/docker/healer_test: starting docker test server on setup
e42c076 provision/docker/healer: registering ContainerHealer
8a86ae5 provision/docker/healer: implementing Heal method on ContainerHealer
acdf9c7 provision/docker/healer: updated unhealthyRunningContainers comment to match new function name
ed8905b provision/docker/healer: also checking if container is running on unhealthyRunningContainers
60e3dc9 provision/docker/healer: created isRunning and isHealthy helper methods
e962889 provision/docker/healer: small improvement on function comment
430d656 api: addLog now uses the source param as source instead of 'app'
72aa8b3 provision/docker: also fix containers when IP changes
f0d613c provision/docker/healer: started writing container healer
ea4b457 provision/docker/stubs_test: expecting call to list containers in docker test server
0ccabd1 provision/docker: s/startTestDockerServer/startDockerTestServer
973e44c provision/docker: use networkInfo instead of hostPort and ip
9e8dcff provision/docker: add action for setNetworkInfo
2b8464d provision/docker: introduce networkInfo method
d865c48 app: added some logs on restart.
0419622 provision/docker: use ssh-agent to run commands remotely
9149f22 auth: fix SMTP code
77305b5 provision/docker: add FakeSSHServer
0b3dd06 provision/docker: set Content-Type to text on sshHandler
6184b54 proviision/docker/provisioner:  fixing function name in comment
ed0423c collector: log errors in Addr
30fa968 provision/docker: rebinding host on Provisioner.RemoveUnit
faba29e provision/docker/provisioner.go: s/newC/newContainer
512ff9c provision/docker/provisioner: binding new containers on deploy
340c9c8 provision/docker: register sshAgentCmd
075d3f7 provision/docker: implement sshAgentCmd.Run
689c3d3 provision/docker: starting to implement the sshAgentCmd
cca1830 docs/apps/client/usage: adding tsuru default port to target cmd example
2126eb1 app: exporting bind-service constant refering to the queue action
b32bafc provision/docker: add handler for sshing to containers
5e09936 api: use FlushingWriter from the io package
fc60ce3 io: export FlushingWriter.wrote via method
6e78b46 io: export FlushingWriter
c525e15 api, io: move FlushingWriter
b90d432 docs/provisioners/docker/architecture: starting to document docker provisioner architecture
aae43d6 provision/docker: use host address instead of container's one as unit IP
5278f12 provision/docker: remove unnecessary step from executor mocking
d8c790c provision/docker: split TestCollectStatus in multiple parts
4019961 provision/docker: s/buildImageName/assembleImageName
fec1c8f provision/docker: rename pushMaxTry to maxTry
aa7d568 provision/docker: add retry on pull
848dbbb docs: changing the font-weight.
352b617 provision/docker/provisioner: rollback from using host addr in ssh-keygen cmd
f9aa9e0 docs/api: docs about service instance status.
0a06afb docs/api: service instance info.
71f0859 docs/api: docs about list service instances.
c3d4b49 docs/api: remove service instance.
2a1954a docs/python: fix some typos.
56a8c92 docs/ruby: several fixes.
f6aa29a docs/api: new service instance.
c00b2f7 docs/api: added docs about unbind.
4ca145d provision/docker: remove image only once
8114aae cmd/tsuru: version 0.8.3
560aae8 docs/api: added doc about bind.
d65a7d6 docs/api: update sections index.
002f06c provisioner/docker/provisioner.CollectUnit: using container host address and host port
b0c3e50 docs: added links for quickstarts.
b74bc4e added link to raisl quickstart.
69ccedd docs/ruby: added real outputs.
249b651 docs/ruby: running assets:precompile.
e6522c6 docs/ruby: using $PORT to define the app port.
e74c588 docs/ruby: deployment hooks.
8629988 docs/ruby: running migrations.
098c0f8 docs/ruby: binding mysql.
4cd5d36 docs/ruby: running your app.
af5634f docs/ruby: updated the dependencies section.
e512949 docs/ruby: removed ruby-dev package.
8e0e239 etc/tsuru-docker.conf: updating command that starts containers
9e9743e provision/docker: always use the image with the registry prefix
8a0a5a8 docs/quickstart: fixed repo url.
15801b7 bump to 0.2.0.

git-subtree-dir: src/github.com/globocom/tsuru
git-subtree-split: 6a246cfc146ff3219d39ff16c6c1583e13055ac6
Merge commit 'c6d248a843596f3d506132c33f5d7a9b1c36230f'