Mary Anthony
bc7a43cb44
Putting into our new format for cloud
...
Adding in Seb's comments
Updating with Fred's comments
Signed-off-by: Mary Anthony <mary@docker.com>
2015-04-21 14:48:48 -07:00
Fred Lifton
21c8d211e1
Merge pull request #12536 from mountkin/remove-unsupported-instructions-from-doc
...
Remove some unsupported instructions in the docs.
2015-04-21 14:08:31 -07:00
Alexander Morozov
7ba8c3b26f
Merge pull request #12567 from brahmaroutu/integration_test6_12255
...
moving integration tests to graph unit tests
2015-04-21 13:58:02 -07:00
Brian Goff
725ea8c09e
Merge pull request #12600 from LK4D4/remove_image_set
...
Remove image_set engine job
2015-04-21 16:51:46 -04:00
Brian Goff
b098a42559
Merge pull request #12564 from LK4D4/remove_jobs_trust
...
Remove engine from trust
2015-04-21 16:49:01 -04:00
Alexander Morozov
783dbcade3
Merge pull request #12609 from runcom/remove-not-needed-readHostConfig
...
Remove not needed call to container.readHostConfig()
2015-04-21 13:45:48 -07:00
Alexander Morozov
79a7fedcd8
Remove image_set engine job
...
It was unused
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-04-21 13:04:28 -07:00
Antonio Murdaca
a3c4801c92
Remove not needed call to container.readHostConfig()
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-21 22:00:33 +02:00
Doug Davis
b807ac1115
Merge pull request #12601 from runcom/remove-job-image-get
...
Remove job image_get
2015-04-21 15:31:42 -04:00
Antonio Murdaca
d07fe18365
Remove job image_get
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-21 21:01:09 +02:00
Brian Goff
6f82613ded
Merge pull request #12604 from runcom/remove-job-image-tarlayer
...
Remove job image_tarlayer
2015-04-21 14:53:54 -04:00
Antonio Murdaca
ba0017595e
Remove job image_tarlayer
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-21 19:59:45 +02:00
Alexander Morozov
371b39c26f
Merge pull request #12598 from runcom/remove-writeJSONEnv
...
Remove writeJSONEnv, fixes #12597
2015-04-21 09:54:55 -07:00
Antonio Murdaca
27811355bd
Remove writeJSONEnv
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-21 18:14:39 +02:00
James Turnbull
afd5636461
Merge pull request #12563 from kentoj/patch-1
...
Clarify data volume init with existing data
2015-04-21 08:57:22 -07:00
Jessie Frazelle
17d5450bc3
Merge pull request #10736 from coolljt0725/add_cpu_limit
...
Add support cpu cfs_quota
2015-04-20 17:55:01 -07:00
Tianon Gravi
e562495d56
Merge pull request #12181 from inatatsu/enable-netgo-with-gccgo
...
Enable "netgo" library when we build with gccgo
2015-04-20 17:31:49 -07:00
Jessie Frazelle
47b703593e
Merge pull request #12430 from icecrime/11551_carry
...
Add -H|--human command-line flag to `docker history`
2015-04-20 17:28:24 -07:00
Jessie Frazelle
82f75df9e9
Merge pull request #12457 from calavera/remove_engine_job_builder
...
Remove engine.Job from Builder.
2015-04-20 17:27:17 -07:00
Jessie Frazelle
874d64e690
Merge pull request #12517 from mavenugo/master
...
Enhanced port integration-cli tests
2015-04-20 17:26:48 -07:00
Jessie Frazelle
4bb8924b52
Merge pull request #12539 from WeiZhang555/httpError
...
change httpError logic
2015-04-20 17:26:09 -07:00
Jessie Frazelle
4a25c5d25b
Merge pull request #12533 from ankushagarwal/gofmt-directory
...
gofmt 1.4.2 src directory
2015-04-20 17:02:43 -07:00
Jessie Frazelle
e1fd7e25de
Merge pull request #12566 from fntlnz/remove-go1.3.3-support
...
Removed go1.3.3 support
2015-04-20 17:01:57 -07:00
Jessie Frazelle
df217120cd
Merge pull request #12471 from coolljt0725/fix_weird_output_format
...
Fix weird terminal output format
2015-04-20 17:01:02 -07:00
Jessie Frazelle
fcacb1793e
Merge pull request #12568 from duglin/TweakConfigPerms
...
Make .docker dir have 0700 perms not 0600
2015-04-20 16:33:10 -07:00
Jessie Frazelle
23ec4cab60
Merge pull request #12556 from icecrime/update_release_checklist
...
Update release checklist
2015-04-20 16:31:40 -07:00
Arnaud Porterie
a8253ec7e7
Early API version bump
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2015-04-20 15:52:26 -07:00
Arnaud Porterie
9838242db1
Merge pull request #9381 from lebauce/default-gateway
...
Proposal: Allow specifying a default gateway for bridge networking
2015-04-20 15:50:35 -07:00
Jessie Frazelle
d5dc565432
Merge pull request #12416 from ya7ya/patch-1
...
adding elementary OS to install script
2015-04-20 14:50:16 -07:00
Phil Estes
435643545c
Merge pull request #12450 from brahmaroutu/integration_test3_12255
...
Port test from integration tests - test low memory on create
2015-04-20 17:27:17 -04:00
David Calavera
3b05005a12
Add flusher check to utils.WriteFlusher.
...
That way we can know when the stream has been flushed.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-04-20 14:25:45 -07:00
moxiegirl
27fc39fdc0
Merge pull request #12559 from moxiegirl/fix-12555-rnotes
...
Adding in 1.60 release notes
2015-04-20 14:18:48 -07:00
Doug Davis
bfeb98a236
Make .docker dir have 0700 perms not 0600
...
Thanks to @dmcgowan for noticing.
Added a testcase to make sure Save() can create the dir and then
read from it.
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-04-20 14:16:50 -07:00
Lorenzo Fontana
92849fdcce
Removed go1.3.3 support
...
Signed-off-by: Lorenzo Fontana <fontanalorenzo@me.com>
2015-04-20 23:09:08 +02:00
Srini Brahmaroutu
29c5596176
moving integration tests to graph unit tests
...
Addresses #12255
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
2015-04-20 21:08:45 +00:00
David Calavera
ae4063585e
Remove engine.Job from builder.CmdBuildConfig.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-04-20 13:37:06 -07:00
David Calavera
9a2c009751
Remove engine.Job references from builder.CmdBuild
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-04-20 13:37:04 -07:00
Mary Anthony
1f4ef5192c
Adding in 1.60 release notes
...
Updating with thaJetzah's comments
Adding in Fred's copy edits
Signed-off-by: Mary Anthony <mary@docker.com>
2015-04-20 13:31:22 -07:00
Kent Johnson
ff9f0134ae
Clarify data volume init with existing data
...
Though I am not clear on the intent of the sentence if it means that existing data in the base image is copied into the new volume then the additions I propose make that more clear than the present language.
Signed-off-by: Kent Johnson <kentoj@gmail.com>
2015-04-20 14:24:40 -06:00
moxiegirl
f85eb4baad
Merge pull request #12414 from draghuram/projectdoc
...
Improve documentation in "project" directory.
2015-04-20 13:16:20 -07:00
Alexander Morozov
08ef006d17
Merge pull request #12009 from duglin/AddConfig
...
Migrate .dockercfg to .docker/config.json and support for HTTP Headers
2015-04-20 13:12:17 -07:00
Doug Davis
18c9b6c645
Add .docker/config.json and support for HTTP Headers
...
This PR does the following:
- migrated ~/.dockerfg to ~/.docker/config.json. The data is migrated
but the old file remains in case its needed
- moves the auth json in that fie into an "auth" property so we can add new
top-level properties w/o messing with the auth stuff
- adds support for an HttpHeaders property in ~/.docker/config.json
which adds these http headers to all msgs from the cli
In a follow-on PR I'll move the config file process out from under
"registry" since it not specific to that any more. I didn't do it here
because I wanted the diff to be smaller so people can make sure I didn't
break/miss any auth code during my edits.
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-04-20 13:05:24 -07:00
Alexander Morozov
cfe7c9c1b2
Merge pull request #12561 from sergeyevstifeev/12549-fix-test-requires-network
...
Add missing testRequires(t, Network)
2015-04-20 12:58:30 -07:00
Alexander Morozov
9e50bf6270
Remove engine from trust
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-04-20 12:48:33 -07:00
Sergey Evstifeev
716e21be2b
Add missing testRequires(t, Network)
...
Fixes #12552
Signed-off-by: Sergey Evstifeev <sergey.evstifeev@gmail.com>
2015-04-20 21:19:50 +02:00
Alexander Morozov
a7690076c9
Merge pull request #12453 from runcom/style-minor-fixes
...
Add minor stylistic fixes
2015-04-20 11:51:04 -07:00
Phil Estes
490a0bd697
Merge pull request #12545 from coolljt0725/remove_rudundant_enter
...
Remove redundant `\n` in daemon/daemon.go
2015-04-20 14:32:27 -04:00
Phil Estes
53edce79f1
Merge pull request #12554 from buddhamagnet/12553-cli-doc-correction
...
12553 fix typo
2015-04-20 14:30:51 -04:00
Phil Estes
f0016c5917
Merge pull request #12495 from LK4D4/apiserver_refactoring
...
Refactoring of api/server for reduce engine usage
2015-04-20 14:10:34 -04:00
Srini Brahmaroutu
1a35b16b08
Port test from integration tests
...
Addresses #12255
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
2015-04-20 17:57:53 +00:00