531f5907d6
Merge pull request #7324 from erikh/move_tarsum
...
Move tarsum to pkg/
2014-07-31 16:56:24 -04:00
1f2d75774a
Merge pull request #7091 from erikh/rfe
...
Update CONTRIBUTING.md with links to sections and `Proposal:` process.
2014-07-31 12:28:05 -07:00
54b287bbc8
Merge pull request #7343 from shykes/cleanup-main
...
Cleanup main function
2014-07-31 12:26:09 -07:00
32fdcaa419
Merge pull request #7193 from hollietealok/doc_remove
...
Removed docker_io_oauth_api.md: Docker is not currently accepting regist...
2014-07-31 15:19:58 -04:00
52db7b8cb7
Update CONTRIBUTING.md with links to sections and RFE process.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-07-31 12:18:31 -07:00
b5ef212ec1
Merge pull request #7337 from rogaha/add_ga_universal_analytics_support
...
Added GA universal analytics support
2014-07-31 09:00:08 -04:00
bbca4867f8
Merge pull request #7338 from tianon/moar-dotcloud
...
Fix more instances of "dotcloud/docker" in hack/
2014-07-30 23:51:23 -04:00
970ebaa887
Merge pull request #7328 from cpuguy83/fix_search_image_oldindex
...
Replace old index image with hub
2014-07-31 12:06:30 +10:00
65d316e50d
Merge pull request #7340 from crosbymichael/tags-unit
...
Fix graph tags test on freebsd
2014-07-30 18:18:14 -07:00
6bc483fa59
Remove perm change in archive
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael)
2014-07-30 18:06:48 -07:00
5ebe86ccf9
Fix graph/tags_unit_test.go on FreeBSD
...
- Directories should have u+x (0600 -> 0700)
- Don't chown files to root because we don't have to
Docker-DCO-1.1-Signed-off-by: Kato Kazuyoshi <kato.kazuyoshi@gmail.com> (github: kzys)
2014-07-30 18:06:19 -07:00
2970ba4877
Merge pull request #7325 from tiborvass/case-insensitive-attach
...
Make --attach case-insensitive
2014-07-30 17:10:16 -07:00
3a14eb066c
Fix more instances of "dotcloud/docker" in hack/ (and add a DOCKER_PKG environment variable to simplify references to our "package path" in our bundlescripts)
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-07-30 17:02:04 -06:00
e13b1fc05f
Added GA universal analytics support
...
Docker-DCO-1.1-Signed-off-by: Roberto Hashioka <roberto.hashioka@docker.com> (github: rogaha)
2014-07-30 15:32:14 -07:00
19c8e74fd3
Merge pull request #7100 from discordianfish/fix-port-allocation
...
Fix masked err in portmapper
2014-07-30 23:51:21 +03:00
3100afa0e1
Merge pull request #7298 from erikh/fix_cli_restart_test
...
fix docker integration-cli restart test race
2014-07-30 23:29:39 +03:00
a713413293
Make --attach case-insensitive
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
2014-07-30 15:36:16 -04:00
8162c6eedd
Merge pull request #7317 from erikh/server_split
...
Partition server/ by image, init, events, container, and "everything left"
2014-07-30 12:28:37 -07:00
a0338ff04b
Merge pull request #7331 from erikh/simplify_checksum
...
Simplify utils.CheckSum.Read to use TeeReader instead
2014-07-30 15:14:41 -04:00
74fdadc86c
Partition server/ by image, init, events, container, and "everything left"
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-07-30 11:50:33 -07:00
ef6b78f7db
Remove CheckSum from utils; replace with a TeeReader
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-07-30 11:23:43 -07:00
c3045f563d
Merge pull request #6962 from erikh/3349-cleanup-docker-socket
...
Clean up the docker socket on termination of the daemon.
2014-07-30 18:43:01 +03:00
ff02bea883
utils.Debugf -> fmt.Printf
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-07-30 08:42:53 -07:00
ba57d3d9e6
Replace old index image with hub
...
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
2014-07-30 11:15:18 -04:00
c18b38f912
Merge pull request #7215 from tiborvass/add-os-to-docker-info
...
Add OS to docker info
2014-07-30 18:02:45 +03:00
b0fb0055d2
Add OS to docker info
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
2014-07-30 10:37:52 -04:00
4184cccb0f
move testdata to tarsum package.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-07-30 06:52:24 -07:00
1219e458d1
utils/tarsum* -> pkg/tarsum
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-07-30 06:42:12 -07:00
4949e070fb
Move kernel version/capabilities detection to NewDaemon
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
2014-07-30 09:26:51 +00:00
e92a9e0b53
Move canonical root path detection to NewDaemon
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
2014-07-30 09:26:51 +00:00
a7d8c732b1
Move TMPDIR symlink cleanup to NewDaemon
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
2014-07-30 09:26:51 +00:00
419b9fe164
Check for OS and root privileges in NewDaemon
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
2014-07-30 09:26:51 +00:00
2b9d8248d6
Removed OAuth doc from mkdocs.yml
...
Docker-DCO-1.1-Signed-off-by: hollietealok <hollie@docker.com> (github: hollietealok)
2014-07-29 13:56:19 -07:00
403df1765a
Merge pull request #7286 from erikh/parsers
...
Move parsing functions to parsers/ and the specific kernel handling...
2014-07-29 16:11:31 -04:00
4398108433
Move parsing functions to pkg/parsers and the specific kernel handling
...
functions to pkg/parsers/kernel, and parsing filters to
pkg/parsers/filter. Adjust imports and package references.
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-07-29 13:09:10 -07:00
335e82f3f7
Merge pull request #7311 from tianon/travis-old-go
...
Add Go 1.2 to Travis so we make sure we keep retrocompat for a little while
2014-07-29 13:48:24 -06:00
1063b438eb
Merge pull request #7292 from erikh/buildfile_move
...
server/buildfile.go -> builder/builder.go
2014-07-29 15:38:42 -04:00
3bae02cbe3
Merge pull request #7272 from unclejack/create_httputils_pkg
...
move resumablerequestreader to pkg/httputils
2014-07-29 12:18:10 -07:00
38bce17904
Add Go 1.2 to Travis so we make sure we keep retrocompat for a little while
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-07-29 13:07:59 -06:00
3a177ccd3a
server/buildfile.go -> builder/builder.go; add maintainers file
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-07-29 11:35:02 -07:00
475131cd4a
Merge pull request #6877 from underscorephil/patch-1
...
Update softlayer.md
2014-07-29 13:20:55 -04:00
4749b884fe
Merge pull request #7256 from jstoja/docs-api-insert-image
...
Fixing docs - Insert api call
2014-07-29 13:19:22 -04:00
900d54b48b
Merge pull request #7269 from r0n22/patch-1
...
Update HTTP Proxy Section
2014-07-29 13:15:27 -04:00
c0517857f6
move resumablerequestreader to pkg
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-07-29 16:30:45 +03:00
3369b4f6f0
Merge pull request #7280 from knappe/patch-1
...
Correct Typo In Documentation
2014-07-29 19:15:48 +10:00
5931669343
fix docker integration-cli restart test race
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-07-28 23:46:14 -07:00
ac3eecf3db
Merge pull request #7062 from crosbymichael/fix-lxc-caps
...
Fix cap drop issues with lxc
2014-07-28 16:19:08 -07:00
331200cbaa
Correct Typo In Documentation
2014-07-28 14:39:17 -06:00
a0dad3dfb2
Merge pull request #7274 from vbatts/vbatts-gh7136
...
progress bar: don't strings.Repeat a negative number
2014-07-28 11:50:16 -07:00
f906f31877
Merge pull request #7210 from fcarriedo/refactor-common-code
...
pkg/units: Refactor common code
2014-07-28 11:45:46 -07:00
Tibor Vass
Solomon Hykes
Michael Crosby
Aaron Huslage
Erik Hollensbe
James Turnbull
Sven Dowideit
Kato Kazuyoshi
Tianon Gravi
Roberto Gandolfo Hashioka
unclejack
Victor Vieux
Brian Goff
hollietealok
unclejack
knappe