Skip to content

Commit

Permalink
fix some typos
Browse files Browse the repository at this point in the history
Signed-off-by: YaoZengzeng <[email protected]>
  • Loading branch information
YaoZengzeng committed Nov 27, 2017
1 parent c837e98 commit 05862d8
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion ctrd/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ First, we should said alibaba/containerd is definitely forked from upstream proj

containerd/containerd definitely has the code base of the other one. Then what is the usage of alibaba/containerd. We say it is **BACK PORTING**.

Every time releasing Pouch to lauch a new version, we vendor containerd/containerd. Since upstream containerd/containerd keeps its own way to evolve, when a serious bug is fixed in the upstream and Pouch needs this for backporting only, it is not proper to vendor the latest container/containerd which contains too many changes. As a result, wo come up with a way to backport server bugfix in alibaba/containerd. Then when backporting, we vendor alibaba/containerd, otherwise we still take advantages of upstream containerd/containerd.
Every time releasing Pouch to launch a new version, we vendor containerd/containerd. Since upstream containerd/containerd keeps its own way to evolve, when a serious bug is fixed in the upstream and Pouch needs this for backporting only, it is not proper to vendor the latest container/containerd which contains too many changes. As a result, we come up with a way to backport severe bugfix in alibaba/containerd. Then when backporting, we vendor alibaba/containerd, otherwise we still take advantages of upstream containerd/containerd.

To check if the package we use is containerd/containerd or alibaba/containerd, we can refer to [vendor.json](../vendor/vendor.json).

Expand Down
4 changes: 2 additions & 2 deletions internal/generator.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@ func GenSystemMgr(cfg *config.Config) (mgr.SystemMgr, error) {
return mgr.NewSystemManager(cfg)
}

// GenImageMgr generates a SystemMgr instance according to config cfg.
// GenImageMgr generates a ImageMgr instance according to config cfg.
func GenImageMgr(cfg *config.Config, d DaemonProvider) (mgr.ImageMgr, error) {
return mgr.NewImageManager(cfg, d.Containerd())
}

// GenVolumeMgr generates a VolumeMgr instance.
// GenVolumeMgr generates a VolumeMgr instance according to config cfg.
func GenVolumeMgr(cfg *config.Config, d DaemonProvider) (mgr.VolumeMgr, error) {
return mgr.NewVolumeManager(d.MetaStore(), cfg.Config)
}

0 comments on commit 05862d8

Please sign in to comment.