Commit Graph

14876 Commits

Author SHA1 Message Date
cf21a7328b Improve documentation in "project" directory.
Signed-off-by: Raghuram Devarakonda <draghuram@gmail.com>
Upstream-commit: fcdb1fbfa1e691bbdfb73a289ff84fbf6b26fad6
Component: engine
2015-04-20 13:08:13 -04:00
3ad142821c Merge pull request #12537 from hqhq/hq_remove_unused_function
remove unused function in server_unit_test.go
Upstream-commit: b5584ec24a6c711a842605dd9fbf5535e77ae878
Component: engine
2015-04-20 07:51:53 -07:00
6d0917e016 Merge pull request #12534 from Mashimiao/delete-unused-function-from-drive
clenaup: delete unused function getEnv
Upstream-commit: d2ce1076a453ac1c016e5637eabae1d8f26cda9e
Component: engine
2015-04-20 07:50:06 -07:00
5f9567a9e8 Merge pull request #12266 from HuKeping/rmjob-info
Remove Job from Info API
Upstream-commit: dacc0507f08b54b506f832e100a1e27e389508e7
Component: engine
2015-04-20 07:10:57 -04:00
899b777d56 Remove Job from Info API
Two main things
- Create a real struct Info for all of the data with the proper types
- Add test for REST API get info

Signed-off-by: Hu Keping <hukeping@huawei.com>
Upstream-commit: f4942ed864f00a31591ef0257a971ef41ddd4c70
Component: engine
2015-04-20 18:14:06 +08:00
8b9e25d786 clenaup: delete unused function getEnv
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
Upstream-commit: e607bb49c48e0478b07fceb640d3e765151050e4
Component: engine
2015-04-20 16:32:42 +08:00
5848586647 remove unused function in server_unit_test.go
After engine refactor, some functions are no longer used.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 641a7ec9ad61a42b255d203b7791198431761104
Component: engine
2015-04-20 16:27:47 +08:00
a45474f68d Merge pull request #12524 from RickWieman/12523-remove-redundant-else
Removes redundant else in registry/session.go
Upstream-commit: b7950b725b846564fc944279e9ae21f852b5dd94
Component: engine
2015-04-19 22:08:50 -07:00
0b57229dc6 Removes redundant else in registry/session.go
Fixes #12523

Signed-off-by: Rick Wieman <git@rickw.nl>
Upstream-commit: 5f2b051ec5a2f639857a1628f3c994fbfd0b3da0
Component: engine
2015-04-19 23:58:55 +02:00
523cbfc000 Merge pull request #12521 from runcom/else-nit
Refactor else branches
Upstream-commit: 24b89b70986c547b2dae15c5cf737fb7e8e416f3
Component: engine
2015-04-19 16:36:39 -04:00
14bae8f05b Merge pull request #12358 from ZJU-SEL/remove_job_from_tag
remove job from tag
Upstream-commit: b1d8ae3824d2902c86d63837b8d413952b546d62
Component: engine
2015-04-19 16:02:28 -04:00
cd0d00e4c3 Merge pull request #12518 from moxiegirl/fix-12516-registry-doc
Docker Registry Server > Docker Registry
Upstream-commit: 2e58350bd6f8c80f4d545bc00d83127d76ab991d
Component: engine
2015-04-19 07:14:09 -07:00
253cd30553 Merge pull request #12512 from ankushagarwal/document-binaries
Document the download location of Linux, Windows and Mac OS X binaries
Upstream-commit: 547ded5df7622d1caf2e096d5b32a21c44b17ae6
Component: engine
2015-04-19 07:12:45 -07:00
af8b6cc8bb Refactor else branches
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: 8655214b3dc8abb4edbca3db3e04557e09a1149b
Component: engine
2015-04-19 15:32:54 +02:00
9e36d6f575 Merge pull request #12432 from Mashimiao/optimize-code-to-clarify-loagic
change code to clarify logic
Upstream-commit: 89092252f07604b7bc1f24fcf3314ed0d43916de
Component: engine
2015-04-19 07:39:24 -04:00
dd5f4141fe remove job from tag
Signed-off-by: Simei He <hesimei@zju.edu.cn>
Upstream-commit: 99f6309b97041bf82cc845340734dc8e47977c8a
Component: engine
2015-04-19 18:36:56 +08:00
714aa2e550 Document the download location of binaries
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
Upstream-commit: 99251f60c2f554fc03ddc9e7b478de6bd5cf0b49
Component: engine
2015-04-19 01:51:03 -07:00
d18c57d820 Docker Registry Server > Docker Registry
Fixing registry index
Tested on beta and this redirect works

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 7b2b7df3866d0c0101e9367b7f4f63bfed5faac4
Component: engine
2015-04-18 19:19:48 -07:00
f90dca15af Merge pull request #12508 from Mic92/docs-speedup
docs: speed up build by reducing build steps
Upstream-commit: 2bc3fb5149bdc3b63c338e76ed821d2d5444e9c1
Component: engine
2015-04-18 10:41:31 -07:00
b527679d3d docs: speed up build by reducing build steps
- should be also easier to maintain

Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk>
Upstream-commit: bbe6df128802b22605f9eb079f105460ec78ac6f
Component: engine
2015-04-18 13:28:52 +02:00
9132395dda Merge pull request #12438 from ourcolorfuldays/fixtypo
fix some typos
Upstream-commit: c158cdbe6f33667a49615c8ba1ff8e33e71d2228
Component: engine
2015-04-18 07:17:55 -04:00
ad529b2798 Merge pull request #12466 from robertabbott/fix_dockerCmd
Removed unnecessary error output from dockerCmd
Upstream-commit: 5fd378c0d1d97601c7cfab6a62bb8da031a0001d
Component: engine
2015-04-17 15:15:34 -07:00
ad230ae4a5 Merge pull request #12496 from moxiegirl/post-release-updates
Updates to Compose docs and ENV vars
Upstream-commit: a313b729e48d0ca9d0085f407b136def162eaf4c
Component: engine
2015-04-17 13:43:06 -07:00
f4a4f24956 Updates to Compose docs and ENV vars
- Compose teamhad forgotten some documentation
- Updated ENV for Distribution also
- Forgot one of the readability sections

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 3a883672417fcb2b3ac0d57d992285849840bfb2
Component: engine
2015-04-17 13:08:57 -07:00
41c63ff3d3 Merge pull request #12490 from LK4D4/carry_12396
remove job from pull and import
Upstream-commit: 055c6dbaefc61c597164aaedee4448bc32522b2e
Component: engine
2015-04-17 15:26:30 -04:00
8a7669d466 Merge pull request #12493 from kostickm/12491-update-message-graphdriver
Updated message severity in graphdriver
Upstream-commit: 9922122fd467b3ba384801a059b05b00fd65998e
Component: engine
2015-04-17 14:53:45 -04:00
26d411e68d Updated message severity in graphdriver
Signed-off-by: Megan Kostick <mkostick@us.ibm.com>
Upstream-commit: cdc63ce5d032de593fc2fd13997311b316c0103b
Component: engine
2015-04-17 10:56:12 -07:00
53ad166d48 Merge pull request #12476 from pwaller/small-cl-improvement
Improve build cancelation description in CHANGELOG
Upstream-commit: d12a2d8aeb483870ae064f70308e6ec7109f2a06
Component: engine
2015-04-17 10:34:08 -07:00
969c19149d Merge pull request #12484 from superseb/12367-jessie-instructions
Added Debian 8 note for adding backports
Upstream-commit: 4492977437fe76e9984a5be2aba2c294c26b622b
Component: engine
2015-04-17 10:16:53 -07:00
6715c2c5be Merge pull request #12470 from zembutsu/patch-1
fix typo
Upstream-commit: ced638094f138ef7f552da1d34c26e3f70eaa8ab
Component: engine
2015-04-17 09:55:56 -07:00
0ff275f7b4 remove job from pull and import
Closes #12396

Signed-off-by: Simei He <hesimei@zju.edu.cn>

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 6e38a53f96403b4cbd38e49e6b294128ed054a20
Component: engine
2015-04-17 09:55:02 -07:00
cf639e2b30 Merge pull request #12486 from runcom/bye-builtins
Remove builtins
Upstream-commit: d845932a52ed7095490ead8dd9b17afb26c9b9ce
Component: engine
2015-04-17 09:52:43 -07:00
5e15f55a29 Removed unnecessary error output from dockerCmd
Changed method declaration. Fixed all calls to dockerCmd
method to reflect the change.

resolves #12355

Signed-off-by: bobby abbott <ttobbaybbob@gmail.com>
Upstream-commit: 621b601b3c602aab5ef0f07903fdf413881bb261
Component: engine
2015-04-17 09:11:14 -07:00
ca55f76013 Added Debian 8 note for adding backports
Signed-off-by: Sebastiaan van Steenis <mail@superseb.nl>
Upstream-commit: 37b9ce61ac5aa762cf0ad34d84bc1924807a7617
Component: engine
2015-04-17 16:32:28 +02:00
f99a495136 Merge pull request #12436 from hqhq/hq_fix_inspect_doc
update docker-inspect man page
Upstream-commit: ddc842ca2a556657e95036f8d23e3c81c9f60996
Component: engine
2015-04-17 06:57:12 -07:00
6488f10044 Remove builtins
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: a0bf80fe0372196812a9cb295f209c08f8037601
Component: engine
2015-04-17 14:27:38 +02:00
e7b9b3570c Improve build cancelation description in CHANGELOG
The existing text didn't explain what had changed.

(See #9774)

Signed-off-by: Peter Waller <p@pwaller.net>
Upstream-commit: 609fa93aa2fd98f2eac30933623f15ece59e4527
Component: engine
2015-04-17 09:44:12 +01:00
1e6d2d1fcb fix some typos
Signed-off-by: bin liu <liubin0329@gmail.com>
Upstream-commit: 70f1910a8bbeb3727829070a2454a636a91e2d48
Component: engine
2015-04-17 08:12:13 +00:00
28d382563f fix typo
Is this typo?

Signed-off-by: Masahito Zembutsu <m.zembutsu@gmail.com>
Upstream-commit: 3cdf94ed1a8a63c068e17310ffa764230b280cbe
Component: engine
2015-04-17 16:06:54 +09:00
9a1ff57e85 Merge pull request #12468 from icecrime/disable_test_pull_verified
Skip TestPullVerified
Upstream-commit: 5e40de92864009e7385300af1dd0a83bb4693126
Component: engine
2015-04-17 02:31:01 -04:00
711b5f704b Merge pull request #12465 from HuKeping/log-level
Change log severity for non-tlsverify bind
Upstream-commit: d47f3707c566b74a3e71dde9a18c264a33009183
Component: engine
2015-04-17 02:10:47 -04:00
9ae8147d1a Change log severity for non-tlsverify bind
closes #12459

Signed-off-by: Hu Keping <hukeping@huawei.com>
Upstream-commit: b052f7a87cb73aa2b0d4827f6cf23b9eb0fdfa2e
Component: engine
2015-04-17 21:27:58 +08:00
7e8cef686e Skip TestPullVerified
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: 9a4fa9c19167756cf39a4d002efe81d4bcd3bb75
Component: engine
2015-04-16 23:05:47 -07:00
52da95a5c0 Merge pull request #12446 from icecrime/please_go_away_testexp.tar
Always remove testexp.tar test file
Upstream-commit: 5207b3eb2b9894c282e46254b727aeee7e03e949
Component: engine
2015-04-17 01:58:29 -04:00
e095f708fe Improve export/import tests cleanup
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: 4e356ee410e1abb86665ab15e4c4155d7c807866
Component: engine
2015-04-16 22:10:55 -07:00
b54e42e0d3 update docker-inspect man page
- sort inspect out
 - update output fields
 - format output
 - add doc about go template
 - other minor fix

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 01548ed1dc25e94bf6cc7decca1d2045069dc5b1
Component: engine
2015-04-17 09:25:06 +08:00
a2f522bead Merge pull request #12455 from bfirsh/remove-registry-redirect
Remove registry redirect
Upstream-commit: 24af87835842b2683a3862f7a32c726013d2a67a
Component: engine
2015-04-16 17:55:02 -07:00
ea3916b969 Merge pull request #12383 from jdivock/patch-1
Upstream-commit: b8530c6c5eff289b8393dd18a4d778c280511097
Component: engine
2015-04-16 14:45:36 -07:00
ce41b2a8bf Merge pull request #12452 from moxiegirl/release-versions-set
Updating with final version from Stephen
Upstream-commit: 2ba1244ad261a85888ede933267038e362ab1a0f
Component: engine
2015-04-16 14:31:45 -07:00
9839262e56 Merge pull request #12411 from sbasyal/patch-2
The link to issue 407 was broken
Upstream-commit: 96b5a3f562fd708fa3773acab4f358f83b97aeff
Component: engine
2015-04-16 13:32:02 -07:00