diff --git a/cluster/images/etcd/rollback/rollback.go b/cluster/images/etcd/rollback/rollback.go index 5ae0e821a8..fb4a52d8f3 100644 --- a/cluster/images/etcd/rollback/rollback.go +++ b/cluster/images/etcd/rollback/rollback.go @@ -325,7 +325,8 @@ func applyRequest(r *pb.Request, applyV2 etcdserver.ApplierV2) { applyV2.Put(r) case "DELETE": applyV2.Delete(r) - case "POST", "QGET", "SYNC": + //case "POST", "QGET", "SYNC": + case "POST", "GET", "SYNC": return default: glog.Fatal("unknown command") diff --git a/cluster/ubuntu/util.sh b/cluster/ubuntu/util.sh index 5d3806c5ed..581c4716c6 100755 --- a/cluster/ubuntu/util.sh +++ b/cluster/ubuntu/util.sh @@ -71,7 +71,7 @@ function setClusterInfo() { # Sanity check on $CNI_PLUGIN_CONF and $CNI_PLUGIN_EXES function check-CNI-config() { if [ -z "$CNI_PLUGIN_CONF" ] && [ -n "$CNI_PLUGIN_EXES" ]; then - echo "Warning: CNI_PLUGIN_CONF is emtpy but CNI_PLUGIN_EXES is not (it is $CNI_PLUGIN_EXES); Flannel will be used" >& 2 + echo "Warning: CNI_PLUGIN_CONF is empty but CNI_PLUGIN_EXES is not (it is $CNI_PLUGIN_EXES); Flannel will be used" >& 2 elif [ -n "$CNI_PLUGIN_CONF" ] && [ -z "$CNI_PLUGIN_EXES" ]; then echo "Warning: CNI_PLUGIN_EXES is empty but CNI_PLUGIN_CONF is not (it is $CNI_PLUGIN_CONF); Flannel will be used" & 2 elif [ -n "$CNI_PLUGIN_CONF" ] && [ -n "$CNI_PLUGIN_EXES" ]; then @@ -545,7 +545,7 @@ function provision-node() { BASH_DEBUG_FLAGS="set -x" fi - # remote login to node and configue k8s node + # remote login to node and configure k8s node ssh $SSH_OPTS -t "$1" " set +e ${BASH_DEBUG_FLAGS} @@ -638,7 +638,7 @@ function provision-masterandnode() { BASH_DEBUG_FLAGS="set -x" fi - # remote login to the master/node and configue k8s + # remote login to the master/node and configure k8s ssh $SSH_OPTS -t "$MASTER" " set +e ${BASH_DEBUG_FLAGS}