Commit graph

  • be32aa566e Merge pull request #219 from runcom/seccomp-buildtag Mrunal Patel 2016-11-29 08:18:06 -08:00
  • 0e4af6d69d
    *: add seccomp buildtag Antonio Murdaca 2016-11-29 16:59:51 +01:00
  • 947b247e4a Merge pull request #217 from sameo/topic/pod_annotations Pengfei Ni 2016-11-29 22:11:32 +08:00
  • e1113c12e3
    merge branch 'pr-136' Aleksa Sarai 2016-11-29 23:53:28 +11:00
  • 60123a77ce server: Export more container metadata for VM containers Samuel Ortiz 2016-11-12 04:15:59 +01:00
  • d6dfd0bf23 Merge pull request #211 from runcom/seccomp-take-1 Mrunal Patel 2016-11-28 14:48:00 -08:00
  • 78ee03a8fc
    add seccomp support Antonio Murdaca 2016-11-23 10:41:48 +01:00
  • 1bd0ba8516 Merge pull request #216 from mrunalp/skip_vendor_lint Mrunal Patel 2016-11-28 12:48:16 -08:00
  • b53a315c35 Skip lint on vendored code Mrunal Patel 2016-11-28 12:32:49 -08:00
  • b6f1b027eb Merge pull request #213 from runcom/bump-runtime-tools Mrunal Patel 2016-11-24 08:29:43 -08:00
  • d12c4b68ac Merge pull request #212 from runcom/execsync-fix Mrunal Patel 2016-11-24 08:28:45 -08:00
  • 19b11293f6 Merge pull request #206 from Crazykev/add-sysctls Mrunal Patel 2016-11-24 08:07:35 -08:00
  • 46c1e95929 Merge pull request #214 from runcom/bump-golang-dockerfile Mrunal Patel 2016-11-24 08:04:56 -08:00
  • cd85d49ff3
    Dockerfile: bump to golang 1.7.3 Antonio Murdaca 2016-11-23 11:50:55 +01:00
  • bdd817d002 add test for sysctls HaoZhang 2016-11-19 10:17:14 +08:00
  • 70481bc5af
    *: bump opencontainers/runtime-tools Antonio Murdaca 2016-11-24 12:26:11 +01:00
  • cbe2a68ce5
    execsync: return proper error description Antonio Murdaca 2016-11-24 10:57:10 +01:00
  • d1e1b7c183 pass sysctls down to oci runtime HaoZhang 2016-11-19 10:16:50 +08:00
  • f785ba20c6 Merge 94df37fa58 into 2e3ad167bb Alvaro Lopez Ortega 2016-11-23 05:56:35 +00:00
  • 2e3ad167bb Merge pull request #207 from runcom/refactor-actions Mrunal Patel 2016-11-22 14:53:06 -08:00
  • ebe2ea0dba
    server: split sandboxes actions Antonio Murdaca 2016-11-22 23:23:01 +01:00
  • 4447207cf1
    server: split images actions Antonio Murdaca 2016-11-22 23:05:37 +01:00
  • 61bb04c87c
    server: split containers actions Antonio Murdaca 2016-11-22 17:49:54 +01:00
  • 13dcadad49 Merge 30f94438be into 5c94544fb8 Mrunal Patel 2016-11-22 01:30:59 +00:00
  • 5c94544fb8 Merge pull request #203 from mrunalp/exec_sync Antonio Murdaca 2016-11-21 23:22:20 +01:00
  • 3e415d0c2f Add test for exec sync Mrunal Patel 2016-11-18 14:58:47 -08:00
  • 78ecdcd298 Add support for timeout Mrunal Patel 2016-11-18 14:48:04 -08:00
  • c06e627a55 Merge pull request #204 from intelsdi-x/runtimeStatus Antonio Murdaca 2016-11-21 12:02:41 +01:00
  • 0289858d21 Add runtime status commpliant with CRI Jacek J. Łakis 2016-11-18 16:03:13 +01:00
  • 83779764f4 Merge pull request #205 from mrunalp/add_owner Mrunal Patel 2016-11-18 14:12:57 -08:00
  • 56b2f799ec Add feiskyer as an OWNER Mrunal Patel 2016-11-18 09:05:14 -08:00
  • 5c1adcbf6a Add client implementation for exec sync Mrunal Patel 2016-11-17 16:42:08 -08:00
  • 52e789c44b Add server implementation for exec sync Mrunal Patel 2016-11-17 16:41:44 -08:00
  • b12a508e4e Add method to exec a command sync in a container Mrunal Patel 2016-11-17 16:40:52 -08:00
  • 920acd2f37 Merge pull request #199 from mrunalp/update_api Antonio Murdaca 2016-11-17 17:09:50 +01:00
  • b62a150151 Update to the latest upstream API Mrunal Patel 2016-11-16 17:20:37 -08:00
  • 9540eb9d2b Merge pull request #196 from Crazykev/fix-time-display Mrunal Patel 2016-11-16 12:17:47 -08:00
  • 82a01cbdda fix ocic time display Crazykev 2016-11-16 15:36:32 +08:00
  • e790094f23 Merge pull request #194 from sameo/master Mrunal Patel 2016-11-15 09:47:13 -08:00
  • 8aba231708 Merge pull request #195 from mrunalp/syslog Antonio Murdaca 2016-11-15 14:39:04 +01:00
  • 5bbef5fc88 oci: Pass the bundle and pid file paths to conmon Samuel Ortiz 2016-11-14 17:52:58 +01:00
  • b14bae4869 conmon: Add --bundle and --pidfile command line options Samuel Ortiz 2016-11-14 17:46:58 +01:00
  • a9412d9156 Merge pull request #193 from intelsdi-x/fix_versioning Antonio Murdaca 2016-11-15 09:47:55 +01:00
  • 85f7ebfb48 version: Fix parsing for gRPC version Jacek J. Łakis 2016-11-08 17:38:39 +01:00
  • 562f8ca684 Add syslog support Mrunal Patel 2016-11-14 16:02:03 -08:00
  • 8d275cebb9 Merge pull request #192 from feiskyer/timestamps Mrunal Patel 2016-11-14 09:33:01 -08:00
  • bbfcf62a0f Set timestamps to nanosecond. Pengfei Ni 2016-11-14 14:26:06 +08:00
  • 02ec8754f5 Merge pull request #169 from cyphar/make-configurable Antonio Murdaca 2016-11-10 14:55:29 +01:00
  • f23cf4f0d9 Merge pull request #190 from WeiZhang555/fix-README Mrunal Patel 2016-11-08 18:24:18 -07:00
  • 9d55130baa Add missing steps in README Zhang Wei 2016-11-08 17:16:25 +08:00
  • c57530eb47 Merge pull request #187 from nalind/wait Mrunal Patel 2016-11-04 11:58:43 -06:00
  • 5d62a9fbb9 Merge pull request #179 from Crazykev/add-metadata Mrunal Patel 2016-11-04 10:00:58 -06:00
  • 97655c3e7b Merge pull request #188 from nalind/dns Mrunal Patel 2016-11-03 11:00:49 -06:00
  • 6ec61a43f3 Log more information about exited children Nalin Dahyabhai 2016-10-18 13:34:03 -04:00
  • ec1bc4d6a8 Handle PodSandboxConfig.DNSConfig.Options Nalin Dahyabhai 2016-10-24 10:57:40 -04:00
  • 295c32331a sort all map type result in ocic Crazykev 2016-11-02 14:36:42 +08:00
  • 018c4db06d add test for container/pod metadata in status/list APIs HaoZhang 2016-10-27 14:24:27 +08:00
  • ca59eaf1a4 display container metadata on the client for container list and status Crazykev 2016-10-26 19:32:59 +08:00
  • 87a83e14b0 return pod metadata in container list and status APIs Crazykev 2016-10-26 19:23:53 +08:00
  • 23d86cd866 Merge pull request #185 from Crazykev/restore-annotation Mrunal Patel 2016-11-01 08:35:27 -07:00
  • 54a022defb restore pod annotations when restart ocid Crazykev 2016-11-01 13:49:21 +08:00
  • 71eaad13b1 foobar Dan Walsh 2016-10-31 15:17:23 -04:00
  • 87a971564b Merge branch 'master' of https://github.com/kubernetes-incubator/cri-o into rpm Dan Walsh 2016-10-31 15:17:07 -04:00
  • a742bf6a8e Merge pull request #184 from rhatdan/ocid.service Mrunal Patel 2016-10-31 12:05:31 -07:00
  • c5cf3bff88 Merge pull request #182 from mrunalp/req_resp_logging Antonio Murdaca 2016-10-31 18:58:25 +01:00
  • 80ef36ba2e Fix install of unit file and configuration file Dan Walsh 2016-10-31 13:38:03 -04:00
  • 8ba639952a Add ocid.spec to build rpms Dan Walsh 2016-10-14 11:33:26 -04:00
  • 5504b68c96 Merge pull request #131 from cyphar/add-make-arguments Mrunal Patel 2016-10-31 10:24:49 -07:00
  • 7896b4f685 Merge pull request #183 from rhatdan/ocid.service Mrunal Patel 2016-10-31 09:36:39 -07:00
  • 07b869ef0b Fix installation of ocid.systemd Dan Walsh 2016-10-31 10:42:23 -04:00
  • bb15f27eae
    makefile: fix several issues and add arguments Aleksa Sarai 2016-10-21 23:19:40 +11:00
  • 2d80c8822f
    merge branch 'pr-149' Aleksa Sarai 2016-11-01 00:14:11 +11:00
  • b30ea458f5
    gitignore: ignore man page junk Aleksa Sarai 2016-10-15 15:56:58 +11:00
  • f2f369f6f8
    systemd: move ocid.service to contrib/ Aleksa Sarai 2016-10-15 15:51:39 +11:00
  • d559b58fd4
    makefile: fix binary dependencies Aleksa Sarai 2016-10-15 15:48:18 +11:00
  • 96c0966ce9
    server: make logDir configurable Aleksa Sarai 2016-10-21 20:58:54 +11:00
  • 33f47d6a6b
    server: make ImageStore configurable Aleksa Sarai 2016-10-21 20:50:49 +11:00
  • 7b60703634 Add logging for all container/sandbox responses Mrunal Patel 2016-10-27 19:31:20 -04:00
  • 3917598a4c Merge a8e7e22a79 into cb7239caa6 Gao feng 2016-10-27 10:44:23 +00:00
  • cb7239caa6 Merge pull request #181 from mrunalp/time_stamps Antonio Murdaca 2016-10-26 22:12:25 +02:00
  • e4b76edd96 Add timestamps to logs Mrunal Patel 2016-10-26 12:45:29 -07:00
  • 0c8c09220b Merge pull request #180 from nalind/image-utils Mrunal Patel 2016-10-26 18:58:31 +00:00
  • 346553312e Add "image list/remove/status" to the client Nalin Dahyabhai 2016-10-20 17:44:47 -04:00
  • c89157e45c Merge pull request #176 from gao-feng/hidden-infra-container Mrunal Patel 2016-10-25 03:25:17 +00:00
  • 30f94438be image: populate image status Mrunal Patel 2016-10-24 19:53:26 -04:00
  • d6ebc9d8b4 Merge pull request #177 from Crazykev/docs Mrunal Patel 2016-10-24 18:05:51 +00:00
  • 292b7e0034 update README.md and ocid.conf.5.md HaoZhang 2016-10-25 01:08:17 +08:00
  • 18f477911c Merge pull request #153 from Crazykev/fix-env Mrunal Patel 2016-10-24 08:38:32 -07:00
  • 78528d9bd1 store infra container in sandbox Gao feng 2016-10-24 20:01:01 +08:00
  • 9c11cc7dba make conmon inherit env from ocid HaoZhang 2016-10-17 15:44:27 +08:00
  • af55785b53 Merge pull request #167 from mrunalp/update_api Antonio Murdaca 2016-10-22 09:17:59 +02:00
  • ed3a56fd29 Merge pull request #172 from mrunalp/more_debugs Antonio Murdaca 2016-10-22 09:17:34 +02:00
  • 0300661054 Merge pull request #174 from mrunalp/revert-170 Mrunal Patel 2016-10-21 16:53:04 -07:00
  • 97d1916772 Revert "oci: cast timestamp to int64" Mrunal Patel 2016-10-21 11:26:57 -07:00
  • 8bd18f4643 Revert "oci: cast timestamp to int64" Mrunal Patel 2016-10-21 11:26:57 -07:00
  • 7f726b704a Add more debugs Mrunal Patel 2016-10-21 11:14:22 -04:00
  • b117dd863c Update to latest version of kubernetes CRI API Mrunal Patel 2016-10-20 18:33:50 -04:00
  • 32af4ce45b Merge 9990e75bfe into 6f9e51fc7d Aleksa Sarai 2016-10-21 12:13:23 +00:00
  • 6f9e51fc7d Merge pull request #170 from cyphar/port-to-i586 Antonio Murdaca 2016-10-21 14:06:00 +02:00
  • 8ace3647fa
    oci: cast timestamp to int64 Aleksa Sarai 2016-10-21 22:18:47 +11:00