Commit Graph

366 Commits (db08552f10366702429ad7d7a37a942affb7ee8b)

Author SHA1 Message Date
minikube-bot 3dccb2bea0 Updating ISO to v1.22.0-1628238775-12122 2021-08-06 09:27:20 +00:00
minikube-bot 16f5466439 Updating ISO to v1.22.0-1628159026-12129 2021-08-05 11:19:56 +00:00
minikube-bot 6aa3c7ff11 Updating ISO to v1.22.0-1627488369-11483 2021-07-28 17:03:32 +00:00
minikube-bot 190226eb07 bump default/newest kubernetes versions 2021-07-26 08:03:10 +00:00
minikube-bot 839b0fbdbc bump default/newest kubernetes versions 2021-07-19 08:02:48 +00:00
minikube-bot 35253acf40 bump default/newest kubernetes versions 2021-07-12 08:02:55 +00:00
minikube-bot 058d2b4201 bump default/newest kubernetes versions 2021-07-05 08:02:58 +00:00
minikube-bot 0e60bdd8f3 Update auto-generated docs and translations 2021-07-02 21:34:57 +00:00
Steven Powell c29adeaa06
Merge pull request #11864 from minikube-bot/auto_bump_k8s_versions
bump default/newest kubernetes versions
2021-07-02 21:32:45 +00:00
Medya Ghazizadeh 8667d10572
Merge pull request #11876 from minikube-bot/kicbase-release-v0.0.25
Update kicbase to v0.0.25
2021-07-02 10:07:45 -04:00
minikube-bot db8ceca6ed Update ISO to v1.22.0 2021-07-02 01:00:03 +00:00
minikube-bot 4db717a5eb Update kicbase to v0.0.25 2021-07-01 23:38:36 +00:00
minikube-bot 1a5b4ac397 bump default/newest kubernetes versions 2021-07-01 20:49:00 +00:00
minikube-bot 202e2fa36f Updating kicbase image to v0.0.24-1625170572-11834 2021-07-01 20:31:45 +00:00
minikube-bot 2bf9076527 Updating kicbase image to v0.0.24-1625086337-11824 2021-06-30 21:07:40 +00:00
minikube-bot 8e62a7d4a0 Update ISO to v1.22.0-beta.0 2021-06-29 19:32:53 +00:00
Ilya Zuyev 68c4d072fe Revert "Merge pull request #11688 from afbjorklund/buildroot-2021.02"
This reverts commit 02abe7856c, reversing
changes made to 4d078ae82f.
2021-06-28 17:11:11 -07:00
Ilya Zuyev 51d2e89fe4 Revert "Merge pull request #11778 from minikube-bot/iso-release-v1.22.0-beta.0"
This reverts commit fd703f95f6, reversing
changes made to 0b170db6cd.
2021-06-28 17:11:05 -07:00
ilya-zuyev fd703f95f6
Merge pull request #11778 from minikube-bot/iso-release-v1.22.0-beta.0
Update ISO to v1.22.0-beta.0
2021-06-28 12:48:11 -07:00
Sharif Elgamal 0b170db6cd
Merge pull request #11772 from minikube-bot/kicbase-release-v0.0.24
Update kicbase to v0.0.24
2021-06-28 10:56:18 -07:00
Steven Powell e8b3db9485
Merge pull request #11692 from spowelljr/addNoLimit
Add ability to pass 'max' value to memory and cpus flags
2021-06-28 17:09:32 +00:00
minikube-bot f2c8ac2f7e Update ISO to v1.22.0-beta.0 2021-06-28 01:20:41 +00:00
minikube-bot bce90e5037 Update kicbase to v0.0.24 2021-06-25 23:41:39 +00:00
minikube-bot edab19ddef Updating ISO to v1.21.0-1624660371-11688 2021-06-25 23:23:12 +00:00
minikube-bot 203d1b6b0e Updating ISO to v1.21.0-1624560657-11688 2021-06-25 13:44:30 -07:00
minikube-bot 4a54d5b93c Updating ISO to v1.21.0-1624344650-11688 2021-06-25 13:44:28 -07:00
Steven Powell 6799b19972 use constant for flag description 2021-06-25 10:49:28 -07:00
Steven Powell a2ae86cb7c renamed flag value from nolimit to max 2021-06-25 10:49:28 -07:00
Steven Powell 08c8996234 updated docs 2021-06-25 10:49:28 -07:00
minikube-bot 9d94dcb734 Updating ISO to v1.21.0-1623378770-11632 2021-06-11 03:27:59 +00:00
Sharif Elgamal 17a047340d
Merge pull request #11611 from minikube-bot/iso-release-v1.21.0
Update ISO to v1.21.0
2021-06-09 15:27:11 -07:00
minikube-bot 0bf3855ee1 Update ISO to v1.21.0 2021-06-09 01:11:03 +00:00
minikube-bot 64a41824c5 Update kicbase to v0.0.23 2021-06-09 00:28:52 +00:00
Medya Gh 7f528a4061 bump default k8s version and newest 2021-05-27 12:57:23 -07:00
Evan Baker eca8a2d540
fix typo in flag documentation: sytemd -> systemd
Signed-off-by: Evan Baker <rbtr@users.noreply.github.com>
2021-05-14 17:00:03 -05:00
minikube-bot e8b16a5247 Updating kicbase image to v0.0.22-1620785771-11384 2021-05-12 02:25:58 +00:00
Medya Ghazizadeh 4bb44282d7
Merge pull request #11298 from minikube-bot/kicbase-release-v0.0.22
Update kicbase to v0.0.22
2021-05-06 10:56:40 -07:00
Medya Ghazizadeh 501d51eff2
Merge pull request #11299 from minikube-bot/iso-release-v1.20.0
Update ISO to v1.20.0
2021-05-06 10:55:43 -07:00
Medya Gh 5d37f3d151 site 2021-05-05 16:27:52 -07:00
Medya Gh 5b7acd315a update newest kubernetes version 2021-05-05 16:27:52 -07:00
Sharif Elgamal 6850e7312a generate-docs 2021-05-05 14:54:36 -07:00
minikube-bot 625a06ce6d Update kicbase to v0.0.22 2021-05-05 21:18:37 +00:00
ilya-zuyev 27045fd421
Merge pull request #11239 from minikube-bot/kicbase-release-v0.0.21
Update kicbase to v0.0.21
2021-04-30 11:36:16 -07:00
minikube-bot c5b65cab51 Update kicbase to v0.0.21 2021-04-30 18:08:55 +00:00
minikube-bot 2e12378c99 Update ISO to v1.20.0-beta.0 2021-04-30 06:22:22 +00:00
minikube-bot fff23925e0 Updating kicbase image to v0.0.20-1619543236-11212 2021-04-27 17:16:43 +00:00
Medya Ghazizadeh 8ce6326186
Merge pull request #11054 from afbjorklund/iso-os-update
Upgrade buildroot minor version
2021-04-24 21:10:51 -07:00
Medya Ghazizadeh 30d659c635
Merge pull request #11055 from afbjorklund/kic-os-update
Update kicbase base image
2021-04-24 21:09:32 -07:00
minikube-bot 6ff3832348 Updating ISO to v1.19.0-1619288095-11054 2021-04-24 19:08:52 +00:00
minikube-bot 2f1943d654 Updating ISO to v1.19.0-1618897865-11099 2021-04-20 06:50:07 +00:00
minikube-bot 0f678017c5 Updating ISO to v1.19.0-1618553696-11111 2021-04-16 07:13:48 +00:00
minikube-bot 0e1fd72042 Updating kicbase image to v0.0.20-1618262794-11055 2021-04-12 21:36:41 +00:00
ilya-zuyev a9cf5e9337
Merge pull request #11049 from minikube-bot/iso-release-v1.19.0
Update ISO to v1.19.0
2021-04-09 17:11:21 -07:00
minikube-bot 2c9be984fd Update ISO to v1.19.0 2021-04-09 23:27:53 +00:00
minikube-bot f7c204d907 Update kicbase to v0.0.20 2021-04-09 19:23:04 +00:00
Sharif Elgamal ffba51f082 Merge branch 'master' of github.com:kubernetes/minikube into medya-autopause-vm 2021-04-08 14:00:37 -07:00
Sharif Elgamal 699c663df3
Revert "Bump newest supported kubernetes version to v1.21.0-rc.0" 2021-04-08 13:06:00 -07:00
minikube-bot 831c3dfdbd Updating kicbase image to v0.0.19-1617905290-11019 2021-04-08 18:17:37 +00:00
minikube-bot 61aa26dec2 Updating ISO to v1.19.0-1617859429-11019 2021-04-08 06:21:11 +00:00
Ilya Zuyev a88664d771 bump NewestKubernetesVersion to v1.21.0-rc.0 2021-04-06 17:01:29 -07:00
minikube-bot 53babcc152 Update kicbase to v0.0.19 2021-04-05 22:22:23 +00:00
minikube-bot 77daf46300 Update ISO to v1.19.0 2021-04-05 20:00:42 +00:00
Sharif Elgamal 6786da83f3
Merge pull request #10217 from pkalever/nbd-iso
iso: enable Network Block Device support
2021-04-02 11:43:10 -07:00
minikube-bot 6bac9bf4f2 Updating ISO to v1.18.0-1617380636-10217 2021-04-02 17:20:26 +00:00
minikube-bot 3490ffaefe Updating ISO to v1.18.0-1617297297-10217 2021-04-01 18:03:38 +00:00
Predrag Rogic 06d4313f3f
kvm2 driver: add static ip 2021-03-27 23:33:24 +00:00
Predrag Rogic fcc6283859
kvm2 driver: add dedicated network 2021-03-26 23:34:04 +00:00
minikube-bot dc94b53463 Updating ISO to v1.18.0-1616648395-10217 2021-03-25 05:44:42 +00:00
Medya Ghazizadeh d1341ceded
Merge pull request #10647 from afbjorklund/docker-20.10.4
ISO Upgrade Docker, from 20.10.3 to 20.10.4
2021-03-23 10:08:00 -07:00
Anders F Björklund a7cf6feb9e Regenerate documentation to fix failing unit test 2021-03-23 07:44:06 +01:00
minikube-bot 3d9d0e105c Updating ISO to v1.18.0-1616464260-10647 2021-03-23 02:43:42 +00:00
minikube-bot d299be963d Updating ISO to v1.18.0-1615350772-10704 2021-03-10 05:22:51 +00:00
Medya Ghazizadeh d2cb052fca
Merge pull request #10653 from Loyen/add-listen-address-flag
Add flag "--listen-address" for docker and podman driver
2021-03-05 12:56:22 -08:00
Patrik Freij 29a7145e9d Add podman support for --listen-address 2021-03-02 20:59:27 +01:00
phantooom badc5d4532 add more check for kvm2 support simulate numa node 2021-03-02 22:27:26 +08:00
phantooom e11f23a4c9 kvm2 driver support simulate numa node 2021-03-02 22:27:26 +08:00
Steven Powell 0c1c0ee9a7 ran generate-docs 2021-03-01 15:40:45 -07:00
Patrik Freij 6604c9254a Generate docs to add --listen-address 2021-03-01 16:51:15 +01:00
minikube-bot 2c292cca75 Update kicbase to v0.0.18 2021-02-25 23:14:51 +00:00
Medya Gh f272822d15 bump kic base 2021-02-24 13:45:53 -08:00
Medya Gh 549bb10a52 update kicbase with pause 2021-02-24 12:30:06 -08:00
Ilya Zuyev 702f4bbb3e run make generate-docs 2021-02-23 16:21:04 -08:00
Medya Ghazizadeh 2ac7bcd8d1
Merge pull request #10548 from jiefenghe/master
disable minikube-scheduled-stop.service until a user schedules a stop
2021-02-22 01:04:50 -08:00
Jiefeng He d6e9174435 update new tag, SHA, and doc due to new kicbase image 2021-02-21 17:27:24 -08:00
Medya Gh 7ec54bf958 update docs 2021-02-20 16:17:56 -08:00
Medya Gh d120656161 update image 2021-02-20 10:55:56 -08:00
Medya Gh 712ab628a6 update kicbase 2021-02-20 10:11:35 -08:00
Medya Gh a66d2a3124 bupm oldest kubernetes version to v1.14.0 2021-02-20 10:07:26 -08:00
Sharif Elgamal 9abb3bed51 update kicbase image 2021-02-19 18:08:41 -08:00
Sharif Elgamal 17af0f999b update kicbase image for testing 2021-02-18 19:20:17 -08:00
Sharif Elgamal 74e2127a87 update kicbase image for the last time 2021-02-18 18:28:02 -08:00
Sharif Elgamal 31ea98ca50 update kicbase to newest build 2021-02-18 15:04:34 -08:00
Sharif Elgamal fd897f4f23 fix up repo stuff 2021-02-17 10:32:48 -08:00
Sharif Elgamal 1233508e3c generate-docs 2021-02-17 09:59:56 -08:00
Medya Ghazizadeh 597091d84b
Merge pull request #10106 from spowelljr/userFlag
Add new flag --user and to log executed commands
2021-01-26 15:44:58 -08:00
Medya Ghazizadeh 3668e15224
Merge pull request #10194 from ilya-zuyev/ilyaz/update_k8s_version_2
update k8s version to  v1.20.3-rc.0
2021-01-22 10:02:44 -08:00
Priya Wadhwa 4636c04e5c fix generate docs 2021-01-21 14:06:03 -08:00
Steven Powell 82f7df5b56 Add user flag and log executed commands 2021-01-20 17:30:48 -07:00
Ilya Zuyev daa7b2780b update k8s version to v1.20.3-rc.0 2021-01-20 16:22:05 -08:00
Anders F Björklund 541193c945 Address review comments, rename to ssh-ip-address 2021-01-16 14:44:56 +01:00
Anders F Björklund abb556f7f5 Merge branch 'master' into generic 2021-01-13 20:15:17 +01:00
Ilya Zuyev d886639479 fix unit tests 2021-01-12 11:31:09 -08:00
Anders F Björklund b2121eae39 Rename the generic driver to the ssh driver
Now that we have forked the machine driver
2021-01-09 14:36:32 +01:00
Anders F Björklund 39218369c0 Improve help text for generic driver flags 2021-01-08 07:55:28 +01:00
Anders F Björklund 749843248e Merge branch 'master' into generic 2021-01-08 07:53:49 +01:00
Priya Wadhwa 0b522445ad update flag and documentation 2021-01-06 14:38:15 -08:00
Anders F Björklund 00763352b6 Add minikube support for the "generic" VM driver
This driver connects to an already existing virtual machine,
using the provided IP address and SSH user/key/port parameters.

On this machine, libmachine will provision the docker daemon
and minikube will bootstrap the kubernetes cluster (as usual).
2021-01-06 18:03:43 +01:00
Priya Wadhwa 81f00fc3e3 update description 2020-12-21 16:58:49 -08:00
Priya Wadhwa 55f496492c fix merge conflict 2020-12-16 10:37:51 -08:00
Sharif Elgamal 47d802a63e fix docs 2020-12-14 16:58:53 -08:00
Medya Gh f3be305abb bump iso on head for snapshot4 2020-12-11 12:11:26 -08:00
Medya Gh f66976480b update docs 2020-12-09 17:39:06 -08:00
Medya Gh 34ff43cc8f update docs 2020-12-09 14:42:35 -08:00
Medya Gh c69e353bf8 docs 2020-12-09 12:50:50 -08:00
Medya Gh 564e74c635 update default kubernetes version to 1.20.0 2020-12-09 12:30:50 -08:00
Medya Gh 2fe6cd7b18 docs 2020-12-08 16:26:58 -08:00
Medya Gh c6badf60a4 update docs 2020-12-08 13:50:41 -08:00
Priya Wadhwa f373155d55 merge conflict 2020-12-03 10:56:41 -08:00
edtrist 70b12370e7 Regenerate docs to add shell language to commands 2020-12-01 22:42:41 +00:00
Medya Gh 9d7763cdcf update docs 2020-11-25 15:35:22 -08:00
Priya Wadhwa 5e1382432f update docs 2020-11-24 10:48:20 -08:00
Priya Wadhwa e88b0908bf Update docs 2020-11-18 11:10:45 -08:00
Medya Ghazizadeh 992c113100
Merge pull request #9693 from medyagh/k8s_ver_v15
update kubernetes version
2020-11-13 14:05:11 -08:00
Medya Gh 718d76dd04 update kubernetes version 2020-11-12 18:32:52 -08:00
Medya Gh 07cfe6408f update docs 2020-11-12 16:04:26 -08:00
Priya Wadhwa 9bb9355b50 fix merge conflict 2020-11-11 11:57:27 -08:00
Sharif Elgamal 0f408d9d44
Merge pull request #9385 from bluestealth/8990
Improve parsing of start flag apiserver-names
2020-11-11 11:14:58 -08:00
Medya Gh be786ac95b docs 2020-11-09 18:39:37 -08:00
Medya Gh 28044cddb5 update docs 2020-11-09 12:36:16 -08:00
priyawadhwa 18b0c00698
Merge pull request #9622 from priyawadhwa/help
Update docs to include --help flag
2020-11-06 14:57:51 -08:00
Medya Ghazizadeh 9afe7c6203
Merge pull request #9604 from medyagh/bump_kicbase
Bump kicbase on head
2020-11-06 14:31:16 -08:00
Priya Wadhwa 760ad89f1f Update docs to include --help flag 2020-11-06 13:43:54 -08:00
Priya Wadhwa 19b2be23bc fix merge conflict 2020-11-05 14:31:39 -08:00
Medya Gh 30e9a059c4 update docs 2020-11-05 12:51:18 -08:00
Predrag Rogic d49f4173b3
update --namespace flag description 2020-11-04 22:14:00 +00:00
Predrag Rogic 3427f078c3
add support for namespace 2020-11-04 22:13:45 +00:00
Michael Ryan Dempsey 30a48d7b57
Update documentation 2020-11-03 10:59:27 -08:00
Predrag Rogic 80dbe48a50
update klog version to v2.4.0 2020-11-02 23:47:12 +00:00
Priya Wadhwa 267769c640 update docs 2020-10-26 15:14:58 -07:00
Priya Wadhwa e807362329 update docs 2020-10-23 10:04:11 -07:00
Medya Gh 37f37fd504 resolve conflict 2020-10-13 15:45:46 -07:00
Thomas Strömberg 5ce9d99d68
Merge pull request #9355 from PriyaModali/klog
Switch logging implementation from google/glog to kubernetes/klog
2020-10-13 12:54:49 -07:00
Medya Gh 62dc953456 update docs 2020-10-12 17:30:03 -07:00
Priya Modali 59548194bd Merge branch 'master' of https://github.com/kubernetes/minikube into klog 2020-10-09 17:45:35 -07:00
Priya Modali 2985e8a21e Updating unit tests. 2020-10-08 15:10:50 -07:00
Medya Gh 8c7e4f0298 updarte docs 2020-10-08 13:59:56 -07:00
ToonvanStrijp 78a1532408 update docs 2020-10-07 18:17:13 +02:00
ToonvanStrijp e7e928b649 update docs 2020-10-06 13:51:23 +02:00
Medya Gh 23eb169055 generate docs 2020-09-29 13:16:37 -07:00
Sharif Elgamal 7e7344da18 Update Makefile and release notes for v1.13.1 2020-09-18 16:20:58 -07:00
Thomas Stromberg 942eb539e6 Update DefaultKubernetesVersion to v1.19.2 2020-09-16 17:44:15 -07:00
Medya Ghazizadeh 022d4ceefc
Merge pull request #9207 from tstromberg/v1.19.1
Update default Kubernetes release to v1.19.1
2020-09-15 16:10:22 -07:00
Anders F Björklund 37e521272c Fix copy/paste error in virtualbox nic-type help
It used type "host only" twice, instead of "nat".
2020-09-13 17:25:02 +02:00
Thomas Stromberg c401b42622 Update default Kubernetes release to v1.19.1 2020-09-09 11:20:45 -07:00
Sharif Elgamal 91488dd2da generate-docs 2020-09-02 17:10:46 -07:00
Thomas Strömberg 51a3155cfd
Merge pull request #9126 from tstromberg/error-code-for-everyone
Add a machine readable reason to all error paths
2020-08-31 22:34:24 -07:00
Thomas Stromberg 2c5e8fdaee Add detailed JSON & status codes for all error paths 2020-08-30 17:25:11 -07:00
Thomas Stromberg 305d3580ba Merge branch 'master' into 1.19.0-rc.4-updated 2020-08-28 10:33:17 -07:00
vinu2003 1541ca9132 updated the docs 2020-08-27 10:07:25 +10:00
Thomas Stromberg a63a1ddcda Update to v1.19.0 final release 2020-08-26 13:27:05 -07:00
Thomas Stromberg cffa2ad0c7 Merge branch 'master' into 1.19.0-rc.4-updated 2020-08-26 13:26:05 -07:00
Priya Wadhwa 8e1f154768 update docs 2020-08-25 16:05:13 -07:00
Medya Gh 5dc6c83142 update doc 2020-08-24 15:21:02 -07:00
Thomas Stromberg 099f2a06b0 Update start.md doc 2020-08-21 13:48:31 -07:00
Thomas Stromberg 444dde078f Update NewestVersion to v1.19.0-rc.4 2020-08-20 13:38:45 -07:00
Medya Gh ae086a1f31 gen docs 2020-08-17 17:01:13 -07:00
Medya Gh c94a75032c fix docs 2020-08-17 16:11:59 -07:00
Pablo Caderno 0d7686a1e1 updated documentation
Signed-off-by: Pablo Caderno <kaderno@gmail.com>
2020-08-11 19:08:27 +10:00
Pablo Caderno 37a1d3bc0b Added startHostTimeout flag
Signed-off-by: Pablo Caderno <kaderno@gmail.com>
2020-08-10 16:23:13 +10:00
Sharif Elgamal 459b141237 generate-docs 2020-08-04 15:20:29 -07:00
Sharif Elgamal cdbce0a9e9 docs 2020-07-31 10:47:10 -07:00
Thomas Stromberg 94e866affc Merge to master 2020-07-16 19:53:43 -07:00
Thomas Stromberg fcc15fa353 Merge to master 2020-07-15 21:04:33 -07:00
Thomas Stromberg 14b4a54ba2 Merge to master 2020-07-15 21:03:49 -07:00
Priya Wadhwa 3a290606db Merge branch 'master' of https://github.com/kubernetes/minikube into json-output 2020-07-10 19:12:50 -04:00
Priya Wadhwa bfa4575a5f docs 2020-07-10 17:07:56 -04:00
Medya Gh 210024afdd update docs 2020-07-08 15:26:13 -07:00
Priya Wadhwa 1980e066dd fix lint and generate-docs 2020-07-07 15:57:07 -04:00
Sunny Beatteay 9bcc587def update crio to cri-o in docs and help text 2020-06-29 14:11:20 -04:00
Thomas Stromberg ffcb14a6b2 Add support for Cilium CNI (--cni=cilium) 2020-06-26 11:55:30 -07:00
Thomas Stromberg f901e638f2 Add support for Calico CNI (--cni=calico) 2020-06-26 11:21:15 -07:00
Thomas Stromberg 03ec6f9419 Update docs 2020-06-25 16:09:49 -07:00
Thomas Stromberg 9e95435e00 Add --cni flag, fix --network-plugin=kubenet 2020-06-23 20:10:25 -07:00
Medya Gh 312cdbdedd update docs 2020-05-29 12:45:05 -07:00
Medya Gh 4b280ab362 bump default kubernetes version 2020-05-28 13:44:57 -07:00
Medya Gh 2cc0e165e9 fix docs 2020-05-12 18:24:36 -07:00
Medya Ghazizadeh 3c84c3cf31
Merge pull request #8099 from medyagh/update_kube_ver
update Kubernetes version to v1.18.2
2020-05-13 00:46:20 +00:00
Medya Gh 29d72a469b generate docs 2020-05-12 17:33:36 -07:00
Medya Gh e62fa4b63d update docs 2020-05-12 15:26:28 -07:00
Medya Gh 7dbbbc66cf update kuberentes version to v1.18.2 2020-05-12 15:17:55 -07:00
Medya Gh ace8205c3a gen-docs 2020-05-11 15:31:15 -07:00
Thomas Stromberg cad2960ed5 Run generate-docs 2020-05-07 14:18:00 -07:00
Thomas Stromberg b5fb930021 Run 'make generate-docs' 2020-04-29 11:06:43 -07:00
Thomas Strömberg 147fd9e2b1
Merge pull request #7714 from tstromberg/k8s-v1.18.1
Upgrade default Kubernetes to v1.18.1
2020-04-29 10:29:00 -07:00
Thomas Strömberg 2f78bff4ed
Merge pull request #7858 from priyawadhwa/upgrade-kic
Upgrade docker driver base image to v0.0.10
2020-04-29 08:48:45 -07:00
Thomas Stromberg 798fb930b0 Merge branch 'master' into k8s-v1.18.1 2020-04-28 08:11:34 -07:00
Priya Wadhwa 67efd1120e update docs 2020-04-27 10:47:43 -07:00
Thomas Stromberg 1cbbb6ac0b Merge to master 2020-04-24 16:58:15 -07:00
Priya Wadhwa 045b1e9a3a update docs 2020-04-23 15:02:14 -07:00
Priya Wadhwa dc14146f8d resolve merge conflict 2020-04-23 14:53:28 -07:00