Merge pull request #12609 from mikedanese/rewrite-shell

updating all references to GoogleCloudPlatform in .sh scripts
This commit is contained in:
CJ Cullen
2015-08-12 16:00:43 -07:00
11 changed files with 17 additions and 17 deletions

View File

@@ -136,15 +136,15 @@ gitamcleanup=false
function make-a-pr() {
local rel=$(basename ${BRANCH})
echo "+++ Creating a pull request on github"
hub pull-request -F- -h "${GITHUB_USER}:${NEWBRANCH}" -b "GoogleCloudPlatform:${rel}" <<EOF
hub pull-request -F- -h "${GITHUB_USER}:${NEWBRANCH}" -b "kubernetes:${rel}" <<EOF
Automated cherry pick of ${PULLSUBJ}
Cherry pick of ${PULLSUBJ} on ${rel}.
EOF
}
if git remote -v | grep ^origin | grep GoogleCloudPlatform/kubernetes.git; then
echo "!!! You have 'origin' configured as your GoogleCloudPlatform/kubernetes.git"
if git remote -v | grep ^origin | grep kubernetes/kubernetes.git; then
echo "!!! You have 'origin' configured as your kubernetes/kubernetes.git"
echo "This isn't normal. Leaving you with push instructions:"
echo
echo "+++ First manually push the branch this script created:"

View File

@@ -27,7 +27,7 @@
# declare -x KUBE_MASTER_IP="1.2.3.4"
# - Make sure only essential pods are running and there are no failed/pending pods.
# - Go to a git tree that contains the kubernetes source.
# - git clone git://github.com/GoogleCloudPlatform/kubernetes.git
# - git clone git://github.com/kubernetes/kubernetes.git
# - Checkout the upstream/conformance-test-v1 branch
# - git checkout upstream/conformance-test-v1
# - The working tree will be in a "detached HEAD" state.

View File

@@ -20,5 +20,5 @@ if [ "$#" -lt 1 ]; then
fi
OUTPUT=${2:-${PWD}}
docker run -v ${OUTPUT}:/output gcr.io/google_containers/gen-swagger-docs:v1 https://raw.githubusercontent.com/GoogleCloudPlatform/kubernetes/master/api/swagger-spec/$1.json https://raw.githubusercontent.com/GoogleCloudPlatform/kubernetes/master/pkg/api/$1/register.go
docker run -v ${OUTPUT}:/output gcr.io/google_containers/gen-swagger-docs:v1 https://raw.githubusercontent.com/kubernetes/kubernetes/master/api/swagger-spec/$1.json https://raw.githubusercontent.com/kubernetes/kubernetes/master/pkg/api/$1/register.go