clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-10-04 07:48:44 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,830 Commits 9 Branches 112 Tags
621b601b3c602aab5ef0f07903fdf413881bb261
Commit Graph
14830 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
bobby abbott 621b601b3c 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>
 2015-04-17 09:11:14 -07:00
moxiegirl 24af878358 Merge pull request #12455 from bfirsh/remove-registry-redirect 
Remove registry redirect
 2015-04-16 17:55:02 -07:00
moxiegirl b8530c6c5e Merge pull request #12383 from jdivock/patch-1 2015-04-16 14:45:36 -07:00
moxiegirl 2ba1244ad2 Merge pull request #12452 from moxiegirl/release-versions-set 
Updating with final version from Stephen
 2015-04-16 14:31:45 -07:00
moxiegirl 96b5a3f562 Merge pull request #12411 from sbasyal/patch-2 
The link to issue 407 was broken
 2015-04-16 13:32:02 -07:00
Phil Estes 4325cbb47c Merge pull request #12454 from jfrazelle/bump_version 
Bump version
 2015-04-16 16:27:34 -04:00
Jessica Frazelle e79c77fb8d bump version to 1.6.0-dev 
Signed-off-by: Jessica Frazelle <princess@docker.com>
 2015-04-16 12:56:02 -07:00
Ben Firshman 4c6d5e3a25 Remove registry redirect 
... it was causing an infinite redirect.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2015-04-16 12:54:56 -07:00
Jessica Frazelle 99d0413033 Bump version to v1.6.0 
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <princess@docker.com> (github: jfrazelle)

(cherry picked from commit 47496519da)
 2015-04-16 12:45:02 -07:00
Michael Crosby cb0644a196 Merge pull request #12428 from icecrime/1163_carry 
Added documentation for functions
 2015-04-16 11:43:29 -07:00
Mary Anthony b4b21ff0a6 Updating with final version from Stephen 
Signed-off-by: Mary Anthony <mary@docker.com>
 2015-04-16 11:40:36 -07:00
Alexander Morozov 27edbd2868 Merge pull request #12407 from cpuguy83/move_integration_api_tests 
Move some integration api tests
 2015-04-16 11:40:29 -07:00
Jessie Frazelle dfa5feab2f Merge pull request #12451 from moxiegirl/release-versions-set 
doc fixes for 1.6
 2015-04-16 11:35:46 -07:00
Mary Anthony f44aa3b1fb for 1.6 
Signed-off-by: Mary Anthony <mary@docker.com>
 2015-04-16 11:33:49 -07:00
Brian Goff 308a23021d Move TestPostCreateNull to integration-cli 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-04-16 13:49:46 -04:00
Brian Goff 5dc02a2fa8 Move TestPostJsonVerify to integration-cli 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-04-16 13:49:28 -04:00
Brian Goff 23fa7d41d5 Move TestContainerApiCreate to integration-cli 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-04-16 13:49:10 -04:00
Brian Goff f19061ccfd Move TestPostCommit to integration-cli 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-04-16 13:48:54 -04:00
Brian Goff d9e4b14346 Move TestGetContainersTop to integration-cli 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-04-16 13:48:33 -04:00
Brian Goff 6f5b895bc7 Move SaveAndThenload to integration-cli 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-04-16 13:40:49 -04:00
Brian Goff 8232cc777e Make sockRequestRaw return reader, not []byte 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-04-16 13:40:49 -04:00
Alexander Morozov 5224151da9 Merge pull request #12350 from runcom/remove-job-restart 
Remove job from restart
 2015-04-16 10:27:43 -07:00
Antonio Murdaca e41192a3f8 Remove job from restart 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-04-16 18:50:24 +02:00
Brian Goff 17ef617c77 Merge pull request #12431 from YanFeng-Adam/typo 
Fix a typo in docker/daemon/state.go
 2015-04-16 09:52:40 -04:00
Yan Feng 7e01ecc119 Fix a typo in docker/daemon/state.go 
Signed-off-by: Yan Feng <yanfeng2@huawei.com>
 2015-04-16 10:56:15 -04:00
Jessie Frazelle 1899b2f41a Merge pull request #12423 from crosbymichael/idkbutitworks 
Ensure state is destroyed on daemont restart
 2015-04-15 21:19:38 -07:00
Jason Smith dc104ccb40 added documentation for functions 
Signed-off-by: Jason Smith <jasonrichardsmith@gmail.com>
 2015-04-15 19:28:01 -07:00
Sven Dowideit ad5d655fb2 Merge pull request #12426 from moxiegirl/new-registry-menu 
In with the old menu layout
 2015-04-16 12:22:49 +10:00
Mary Anthony fe8fb24b53 In with the old menu layout 
Signed-off-by: Mary Anthony <mary@docker.com>
 2015-04-15 19:02:01 -07:00
Brian Goff de923f59b3 Merge pull request #12253 from calavera/remove_job_from_start_and_create 
Remove engine.Job from Start and Create
 2015-04-15 21:49:25 -04:00
Michael Crosby a5f7c4aa31 Ensure state is destroyed on daemont restart 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2015-04-15 17:44:03 -07:00
Alexander Morozov 83d809f3d2 Merge pull request #12388 from xiaods/issue-12373 
client.StatusError don't be returned as a pointer
 2015-04-15 17:34:38 -07:00
Jessie Frazelle 2e4d36ed80 Merge pull request #12391 from ibuildthecloud/syslog-format 
Change syslog format and facility
 2015-04-15 14:47:12 -07:00
Sabin Basyal 6860c75b7b The link to issue 407 was broken 
The link to issue 407 was broken. The old link was: https://github.com/docker/docker/issues/407%20kernel%20versions
The link must be: https://github.com/docker/docker/issues/407

Signed-off-by: Sabin Basyal <sabin.basyal@gmail.com>
 2015-04-15 14:06:11 -07:00
Brian Goff 0c7b51089c Merge pull request #12412 from runcom/12410-fix-TestInitializeCannotStatPathFileNameTooLong 
Fix TestInitializeCannotStatPathFileNameTooLong
 2015-04-15 16:11:29 -04:00
Darren Shepherd 05641ccffc Change syslog format and facility 
This patch changes two things

1. Set facility to LOG_DAEMON
2. Remove ": " from tag so that the tag + pid become a single column in
   the log

Signed-off-by: Darren Shepherd <darren@rancher.com>
 2015-04-15 12:46:43 -07:00
Antonio Murdaca 7afb234741 Fix TestInitializeCannotStatPathFileNameTooLong 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-04-15 21:15:05 +02:00
Alexander Morozov 5b048ab2f2 Merge pull request #12369 from runcom/fix-links-graph-ref 
Fix wrong graphdb refs paths purging
 2015-04-15 11:34:58 -07:00
Brian Goff f0c60f7085 Merge pull request #12387 from x1022as/inspect-logpath 
Inspect show right LogPath in json-file driver
 2015-04-15 14:28:39 -04:00
moxiegirl 2499baefdd Merge pull request #12399 from emirozer/master 
closes #8945
 2015-04-15 10:53:10 -07:00
Brian Goff 2ecccda162 Merge pull request #12139 from hqhq/hq_add_cpusest_mems2 
add support for cpuset.mems
 2015-04-15 13:29:43 -04:00
Deshi Xiao bae3023eef client.StatusError don't be returned as a pointer 
closes #12373

1. remove & from client.StatusError
2. remove * from Error method

Signed-off-by: Deshi Xiao <xiaods@gmail.com>
 2015-04-16 01:27:07 +08:00
David Calavera 767df67e31 Decode container configurations into typed structures. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-04-15 10:22:07 -07:00
Jessie Frazelle ec4b0b1e27 Merge pull request #12382 from jfrazelle/modprobe-all-the-things-modules-for-the-modules-god 
try to modprobe bridge
 2015-04-15 08:45:00 -07:00
Jessica Frazelle b3867b8899 try to modprobe bridge 
Signed-off-by: Jessica Frazelle <jess@docker.com>
 2015-04-15 07:19:37 -07:00
Emir Ozer 960de9c8dd closes #8945 
Signed-off-by: Emir Ozer <emirozer@yandex.com>
 2015-04-15 15:31:23 +02:00
Deng Guangxing acf025ad1b Inspect show right LogPath in json-file driver 
Signed-off-by: Deng Guangxing <dengguangxing@huawei.com>
 2015-04-15 11:51:24 +08:00
Qiang Huang f8dc7e8754 Add cpuset-mems support for docker build 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-04-15 09:34:12 +08:00
Qiang Huang 8077b2fb80 add support for cpuset.mems 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-04-15 09:33:46 +08:00
Phil Estes da697dbed6 Merge pull request #12360 from yestin/11601-supplement-tests-part-2 
Improve test accuracy for pkg/chrootarchive (part 2)
 2015-04-14 21:00:12 -04:00