This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add dependency | |
When you want to start new work that is based on the commit under the review, you can add the commit as a dependency. | |
#fetch change under review and check out branch based on that change. | |
git review -d $PARENT_CHANGE_NUMBER | |
git checkout -b $DEV_TOPIC_BRANCH | |
# Edit files, add files to git | |
git commit | |
git review | |
NOTE: git review rebases the existing change (the dependency) and the new commit if there is a conflict against the branch they are being proposed to. Typically this is desired behavior as merging cannot happen until these conflicts are resolved. If you don't want to deal with new patchsets in the existing change immediately you can pass the -R option to git review in the last step above to prevent rebasing. This requires future rebasing to resolve conflicts. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
git config --global http.proxy http://9.21.54.14:3128 | |
git config --global https.proxy https://9.21.54.14:3128 | |
git config --global --unset http.proxy | |
git config --global --unset https.proxy | |
npm config delete proxy |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
In Getting Started with Homebrew, I talked about what the Homebrew package management system is, why you’d want to use it, and how to install it and access its basic functionality. | |
This post expands upon those basic ideas by talking about how to keep your Homebrew up to date — and so ensure it’s doing its job optimally. | |
Tip #1: Update Your Homebrew | |
You want to always ensure that you’re running the newest version of Homebrew and that it has the newest list of formulae available from the main repository. This is done with the “brew update” command: | |
$ brew update | |
Already up-to-date. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
505 git remote -v | |
506 git fetch upsteram | |
507 git fetch upstream | |
508 git branch | |
509 git merge upstream/master | |
510 git branch | |
511 git branch -r | |
512 git checkout k8s_25349 | |
513 git rebase master | |
514 ls |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Git global setup | |
git config --global user.name "Guangya Liu" | |
git config --global user.email "[email protected]" | |
git config --global user.name "Guangya Liu" | |
git config --global user.email "[email protected]" | |
git config user.name "Guangya Liu" | |
git config user.email "[email protected]" |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ok k8s.io/kubernetes/plugin/pkg/scheduler 1.098s | |
ok k8s.io/kubernetes/plugin/pkg/scheduler/algorithm 0.090s | |
ok k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/predicates 0.114s | |
ok k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/priorities 0.092s | |
ok k8s.io/kubernetes/plugin/pkg/scheduler/algorithmprovider 0.083s | |
ok k8s.io/kubernetes/plugin/pkg/scheduler/algorithmprovider/defaults 0.261s | |
ok k8s.io/kubernetes/plugin/pkg/scheduler/api/validation 0.080s | |
ok k8s.io/kubernetes/plugin/pkg/scheduler/factory 0.142s | |
ok k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache 0.095s |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
https://github.com/kubernetes/community/blob/master/contributors/devel/development.md | |
KUBE_ENABLE_CLUSTER_DNS=true | |
KUBE_DNS_SERVER_IP="10.0.0.10" | |
KUBE_DNS_DOMAIN="cluster.local" | |
./hack/local-up-cluster.sh -O | |
git remote add upstream https://github.com/kubernetes/community | |
111 git fetch upstream |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
apply vm https://selfserv.eng.platformlab.ibm.com/ | |
cat /etc/systemd/system/docker.service.d/http-proxy.conf | |
[Service] | |
Environment="HTTP_PROXY=http://ma1demo2:8123" | |
Environment="HTTPS_PROXY=http://ma1demo2:8123" | |
Environment="NO_PROXY=ma1dock1.platformlab.ibm.com,localhost" | |
vim ~/.ssh/config |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# https://docs.docker.com/engine/admin/systemd/ | |
Many Linux distributions use systemd to start the Docker daemon. This document shows a few examples of how to customize Docker’s settings. | |
Starting the Docker daemon | |
Once Docker is installed, you will need to start the Docker daemon. | |
$ sudo systemctl start docker | |
# or on older distributions, you may need to use | |
$ sudo service docker start | |
If you want Docker to start at boot, you should also: |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ELKF: http://www.linuxidc.com/Linux/2016-06/132616.htm | |
http://blog.csdn.net/hiyun9/article/details/51602428 | |
[root@kvm ~]# yum install httpd | |
[root@kvm ~]# echo "<html>10.0.0.137</html>" > /var/www/html/index.html | |
[root@lvs-backup ~]# yum install httpd | |
[root@lvs-backup~]# echo "<html>10.0.0.111</html>" > /var/www/html/index.html | |
2.看下效果: |
OlderNewer