Merge pull request #528 from 'bboreham/name_change'
This commit is contained in:
commit
bb9e26b4ae
33 files changed
+69
-69
No files matched your search
@@ -2,7 +2,7 @@
|
||||
set -e
|
||||
|
||||
# For info on why/how to use this script, see
|
||||
# https://github.com/zettio/weave/wiki/WorkingOnWeave#working-on-docs
|
||||
# https://github.com/weaveworks/weave/wiki/WorkingOnWeave#working-on-docs
|
||||
|
||||
MERGE_ARGS="-X subtree=site"
|
||||
|
||||
@@ -10,7 +10,7 @@ merge_dir=$(mktemp -d -t weave-merge.XXXXXX)/weave
|
||||
git clone -b gh-pages . $merge_dir
|
||||
|
||||
pushd $merge_dir
|
||||
git pull --ff-only git@github.com:zettio/weave gh-pages
|
||||
git pull --ff-only git@github.com:weaveworks/weave gh-pages
|
||||
git fetch origin master
|
||||
git merge $MERGE_ARGS -e -m "Merge master into gh-pages" origin/master
|
||||
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
#! /bin/sh
|
||||
set -e
|
||||
git push git@github.com:zettio/weave gh-pages:gh-pages
|
||||
git push git@github.com:weaveworks/weave gh-pages:gh-pages
|
||||
+1
-1
@@ -3,7 +3,7 @@
|
||||
set -e
|
||||
|
||||
SUDO=${SUDO-sudo}
|
||||
GITHUB_USER=${GITHUB_USER:-zettio}
|
||||
GITHUB_USER=${GITHUB_USER:-weaveworks}
|
||||
DOCKERHUB_USER=${DOCKERHUB_USER:-zettio}
|
||||
RELEASE_NAME=${RELEASE_NAME:-"Weave"}
|
||||
RELEASE_DESCRIPTION=${RELEASE_DESCRIPTION:-"Weaving Containers into Applications"}
|
||||
|
||||
Reference in new issue
Block a user