github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

revert some unwanted changes

pull/6/head
Aaron.L.Xu 2016-12-21 00:36:38 -08:00
parent f15c8d0cf5
commit 3964aae385
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cluster/images/etcd/rollback/rollback.go
View File

@ -325,8 +325,7 @@ func applyRequest(r *pb.Request, applyV2 etcdserver.ApplierV2) {
applyV2.Put(r) applyV2.Put(r)
case "DELETE": case "DELETE":
applyV2.Delete(r) applyV2.Delete(r)
//case "POST", "QGET", "SYNC": case "POST", "QGET", "SYNC":
case "POST", "GET", "SYNC":
return return
default: default:
glog.Fatal("unknown command") glog.Fatal("unknown command")

2
federation/pkg/kubefed/util/util.go
View File

@ -115,7 +115,7 @@ func CreateKubeconfigSecret(clientset *client.Clientset, kubeconfig *clientcmdap
return nil, err return nil, err
} }
// Build the secret object with the minimized and flattened // Build the secret object with the minified and flattened
// kubeconfig content. // kubeconfig content.
secret := &api.Secret{ secret := &api.Secret{
ObjectMeta: api.ObjectMeta{ ObjectMeta: api.ObjectMeta{