Commit Graph

  • c1e9ed3e53 Merge pull request #6985 from vieux/fix_api_1.14 Victor Vieux 2014-07-11 15:35:25 -07:00
  • 1e36ca4638 proper rebase Victor Vieux 2014-07-11 22:39:43 +00:00
  • 8850edab1a Merge pull request #6979 from LK4D4/fix_race_inspect_start Michael Crosby 2014-07-11 13:44:01 -07:00
  • 241e1f987c Use container.Lock in public ToDisk method LK4D4 2014-07-11 21:49:24 +04:00
  • 62e2ad87d9 Edits based on feedback from docs team. Fred Lifton 2014-07-11 11:42:29 -07:00
  • 59f98ccf62 Merge pull request #6890 from huslage/tls-doc-fixes2 James Turnbull 2014-07-11 14:36:24 -04:00
  • eaad0a8c81 Clarified TLS Docs Aaron Huslage 2014-07-07 15:35:05 -04:00
  • 73381dfd80 Merge pull request #6209 from zdover23/03_Jun_2014 James Turnbull 2014-07-11 08:03:36 -04:00
  • 8a3e9e0362 Merge pull request #6961 from crosbymichael/devices-flag Victor Vieux 2014-07-10 17:44:44 -07:00
  • f98a366776 add FSETID back to the caps whitelist Victor Vieux 2014-07-11 00:30:56 +00:00
  • cfffdb552d Added bitbucket hook info and warning re: validating accounts. Fred Lifton 2014-07-10 16:51:16 -07:00
  • c15db86f61 Add --device flag to allow additional host devices in container Timothy 2014-05-31 04:00:47 +00:00
  • b57da60173 Merge pull request #6939 from snitm/thinp-blocksize-fix unclejack 2014-07-10 19:57:07 +03:00
  • dc19a34af4 Merge pull request #6920 from vieux/pr_6408 unclejack 2014-07-10 19:16:23 +03:00
  • 807d93f960 Merge pull request #6941 from tiborvass/use-copy-in-docker-dockerfile Tibor Vass 2014-07-10 10:46:13 -04:00
  • abe9a19e05 Merge pull request #6854 from tomfotherby/patch-1 Sven Dowideit 2014-07-10 10:29:15 +00:00
  • 884f8c36f5 Merge pull request #6945 from fredlf/copyedit-builds Sven Dowideit 2014-07-10 09:06:58 +00:00
  • f5fca81a44 Merge pull request #6948 from squarejaw/master Sven Dowideit 2014-07-10 09:05:48 +00:00
  • bd2c47615b Merge pull request #6922 from tianon/bash-complete-build-directories Tianon Gravi 2014-07-10 00:26:14 -06:00
  • 323df0e24b Fix typos Bryan Bess 2014-07-09 23:14:06 -05:00
  • 952492cc20 bump api to 1.14 & update docs Adrien Folie 2014-07-08 20:37:08 +02:00
  • 61277bebb4 Merge pull request #6942 from jamtur01/addcopy Fred Lifton 2014-07-09 17:48:31 -07:00
  • a276156a44 Fix expect script in mkimage-arch Zoltan Tombol 2014-07-09 17:38:13 +02:00
  • b3bd2d5b6c Revert "removed expect from mkimage-arch since it was not working" Zoltan Tombol 2014-07-09 17:08:17 +02:00
  • 8e5e1a569d New screenshots and revisions to builds.md Fred Lifton 2014-07-09 16:43:39 -07:00
  • f67899e5d8 update for consistency Victor Vieux 2014-07-09 21:47:55 +00:00
  • 6401809a76 add check on docker run Victor Vieux 2014-07-09 00:25:21 +00:00
  • f134d9e4d0 Add support for IPv6 addresses in --dns parameters. Jan Pazdziora 2014-06-13 14:02:12 +02:00
  • 42b9849b1f Merge pull request #6931 from tiborvass/merge-5723 Victor Vieux 2014-07-09 14:23:23 -07:00
  • efd625f4f3 Replaced selected docs references to ADD with COPY James Turnbull 2014-07-09 17:13:26 -04:00
  • 786f8ce10f Replace ADD with COPY in Dockerfile Tibor Vass 2014-07-09 17:05:51 -04:00
  • 0ee458dda8 devmapper: revert the default dm-thin-pool blocksize back to 64K Mike Snitzer 2014-07-09 16:20:01 -04:00
  • b1e80e538c Merge pull request #6936 from vieux/merge_release_v1.1.1 Victor Vieux 2014-07-09 13:31:11 -07:00
  • 81a7587cfd Change version to 1.1.1-dev Victor Vieux 2014-07-09 19:24:11 +00:00
  • fc1bf4682a Merge remote-tracking branch 'origin/release' Victor Vieux 2014-07-09 19:23:53 +00:00
  • 00d5af598a Merge pull request #6915 from vieux/bump_v1.1.1 Victor Vieux 2014-07-09 12:16:22 -07:00
  • 34b700c7bf Updated docker logs timestamp to RFC3339 James Turnbull 2014-05-10 18:51:16 +02:00
  • f673811097 Merge pull request #6926 from LK4D4/log_for_tar_test Tibor Vass 2014-07-09 11:40:55 -04:00
  • 956cad3b32 Merge pull request #6916 from vieux/update_release_checklist_hotfix Tianon Gravi 2014-07-09 07:50:38 -06:00
  • 2199b246f3 Simple additions to TestBuildAddTar Alexandr Morozov 2014-07-09 13:39:38 +04:00
  • c1ad27879c Merge pull request #6570 from cpuguy83/add_cpuguy83_as_volumes_maintainer Solomon Hykes 2014-07-09 02:12:14 -07:00
  • 2c5c501d5d Merge pull request #9 from tianon/vieux-hotfix-minor-nits Victor Vieux 2014-07-09 00:57:03 -07:00
  • 6971f5c244 Tiny text reformat (as per review comments) Tom Fotherby 2014-07-09 08:21:31 +01:00
  • 37a093be23 removing an extraneous space Zac Dover 2014-06-05 11:41:45 +10:00
  • 58d9480aa6 Update bash completion to only complete on directories as the argument to "docker build" Tianon Gravi 2014-07-08 20:26:23 -06:00
  • 710bedaf51 Update RELEASE-CHECKLIST with a few minor nits (periods, whitespace) Tianon Gravi 2014-07-08 19:53:08 -06:00
  • e17cfef1f0 Merge pull request #6891 from rogaha/update_footer_version Sven Dowideit 2014-07-09 01:51:22 +00:00
  • 314e2a3728 Bump version to v1.1.1 Victor Vieux 2014-07-08 21:35:22 +00:00
  • afb119eb53 Merge pull request #6773 from fabiofalci/restart_tests_to_cli Michael Crosby 2014-07-08 17:44:29 -07:00
  • e3ec85f712 Merge pull request #6835 from OddBloke/master James Turnbull 2014-07-08 20:41:59 -04:00
  • 19f873ca05 Merge pull request #6567 from JasonGiedymin/add-h3 Fred Lifton 2014-07-08 17:38:10 -07:00
  • 852cc6a979 Merge pull request #6921 from jamtur01/parsego Michael Crosby 2014-07-08 17:34:09 -07:00
  • 321e9b819d Merge pull request #6826 from fredlf/copyedit-builds James Turnbull 2014-07-08 20:31:04 -04:00
  • bbc512f23b Fixed some more styling issues with command line flags James Turnbull 2014-07-08 20:23:12 -04:00
  • d0b563d37b Merge pull request #6918 from vieux/rebase_events_leak Victor Vieux 2014-07-08 17:18:09 -07:00
  • c5b657327a Merge pull request #6270 from kung-foo/5418-underscore Michael Crosby 2014-07-08 17:09:27 -07:00
  • 4eb22040d9 avoid regression in events test Sam Rijs 2014-07-09 09:35:08 +10:00
  • bbaf2a8ed6 Add test for event limitation Sam Reis 2014-07-04 15:12:21 +10:00
  • 13e7613ad0 Fix server leaking events Sam Reis 2014-07-04 12:47:28 +10:00
  • f3b4015ccd Initial copy edits to builds.md Fred Lifton 2014-06-30 18:28:25 -07:00
  • bfe0fa53e6 Merge pull request #6636 from saaadhu/master Michael Crosby 2014-07-08 16:35:26 -07:00
  • 789e6439eb add hotfix help Victor Vieux 2014-07-08 23:09:22 +00:00
  • a8bb2012bc Merge pull request #6882 from cpuguy83/fix_gh#6856_add_pass_unpause_events Michael Crosby 2014-07-08 15:31:23 -07:00
  • d2c7dcd66a Tests for ADD tar Tibor Vass 2014-07-08 15:34:04 -04:00
  • e13c7c8aac Revert "improve untar when using files instead of directories. Specifies behavior on non-existant targets." Michael Crosby 2014-07-08 12:26:59 -07:00
  • 0f32455aa8 Revert "allow overwrite in untar" Michael Crosby 2014-07-08 12:23:08 -07:00
  • 83030ccbe7 Merge pull request #6911 from crosbymichael/revert-archive unclejack 2014-07-09 00:08:25 +03:00
  • b15853aeda Merge pull request #26 from tiborvass/fix-add-tar-test Michael Crosby 2014-07-08 12:41:48 -07:00
  • ff37e700fc Tests for ADD tar Tibor Vass 2014-07-08 15:34:04 -04:00
  • 34644f5fc5 Add event logs for pause/unpuase Brian Goff 2014-07-07 11:47:06 -04:00
  • c916fa43d0 Revert "improve untar when using files instead of directories. Specifies behavior on non-existant targets." Michael Crosby 2014-07-08 12:26:59 -07:00
  • eea97055fb Revert "allow overwrite in untar" Michael Crosby 2014-07-08 12:23:08 -07:00
  • 3fadeb2381 Merge pull request #6865 from SvenDowideit/remove-the-named-container-before-creating-a-new-one James Turnbull 2014-07-08 14:42:17 -04:00
  • 833fba6657 Merge pull request #6897 from tianon/moar-squeeze-lts Tianon Gravi 2014-07-08 07:57:53 -06:00
  • d96d4dd200 Merge pull request #6899 from sjp38/patch-1 James Turnbull 2014-07-08 08:41:20 -04:00
  • 1cc255b83d Typo fix Tom Fotherby 2014-07-08 10:01:26 +01:00
  • 7cc3436ee3 understanding-docker: Use consistent term SeongJae Park 2014-07-08 14:50:57 +09:00
  • 852a32d096 Merge pull request #6760 from jamtur01/contrib Solomon Hykes 2014-07-07 18:42:29 -07:00
  • 843b374f7e Don't make the user get a container alreayd exists error SvenDowideit 2014-07-07 10:28:53 +10:00
  • 4ee2474d5a Merge pull request #6849 from leeplay/patch-1 Michael Crosby 2014-07-07 16:43:57 -07:00
  • 9638017be3 Merge pull request #6858 from timthelion/patch-6 Sven Dowideit 2014-07-08 09:37:53 +10:00
  • 4bbfd572e7 Merge pull request #6871 from prosto-chewey/patch-1 Sven Dowideit 2014-07-08 09:35:01 +10:00
  • 16bd2397f1 Merge pull request #6870 from andreaturli/doc/jclouds-client Sven Dowideit 2014-07-08 09:29:27 +10:00
  • 2e4164d0ba Update contrib/mkimage/debootstrap to add "sqeeze-lts" to "oldstable" as well Tianon Gravi 2014-07-07 17:14:31 -06:00
  • 0544edc315 Add repo/tag parsing on the daemon for pull and import Victor Vieux 2014-07-07 23:09:42 +00:00
  • c0012fb00a Update the footer version with Enterprise and Partners sections Roberto Gandolfo Hashioka 2014-07-07 13:44:22 -07:00
  • ca239945ba Merge pull request #6886 from tianon/no-binddir-if-docker_host Tianon Gravi 2014-07-07 17:00:03 -06:00
  • 75cb3255af Merge pull request #6720 from fabiofalci/relax_dns_search Victor Vieux 2014-07-07 15:12:29 -07:00
  • 5a05ec9b94 Merge pull request #6857 from vbatts/vbatts-fix_save_repositories Tibor Vass 2014-07-07 17:26:52 -04:00
  • a4bc6c02a7 Merge pull request #6813 from gsalgado/convert-testgetimagesjson Michael Crosby 2014-07-07 13:40:38 -07:00
  • 9f5fa2a3c1 Merge pull request #6829 from unclejack/update_archive_tar unclejack 2014-07-07 23:35:19 +03:00
  • f220709916 Convert TestGetImagesJSON into several unit tests Guilherme Salgado 2014-07-02 10:01:19 +02:00
  • 41890809ce We haven't required lxc and aufs for years now... Timothy Hobbs 2014-07-06 10:38:30 +00:00
  • ea789048c6 Merge pull request #6799 from LK4D4/refactor_portallocator Michael Crosby 2014-07-07 12:39:36 -07:00
  • 6996bb64aa Merge pull request #6821 from LK4D4/broadcast_writer_refactor Michael Crosby 2014-07-07 12:15:47 -07:00
  • b15cf92d6a docker save: more integration tests Vincent Batts 2014-07-07 14:58:27 -04:00
  • 1270978241 Merge pull request #6850 from leeplay/patch-2 Victor Vieux 2014-07-07 11:50:27 -07:00
  • df92ffe131 Merge pull request #6702 from mrunalp/dev/helper_fns Michael Crosby 2014-07-07 11:39:27 -07:00
  • bdbe2e1a2a Merge pull request #6452 from mheon/selinux_btrfs_fix Michael Crosby 2014-07-07 11:34:50 -07:00
  • efbfc9bcff Merge pull request #6645 from snitm/dmthinp-devel unclejack 2014-07-07 21:20:31 +03:00