aboutsummaryrefslogtreecommitdiff
path: root/script/dev-env.sh
diff options
context:
space:
mode:
Diffstat (limited to 'script/dev-env.sh')
-rwxr-xr-xscript/dev-env.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/script/dev-env.sh b/script/dev-env.sh
index a2829c73..71fbd208 100755
--- a/script/dev-env.sh
+++ b/script/dev-env.sh
@@ -6,9 +6,10 @@ GARAGE_DEBUG="${REPO_FOLDER}/target/debug/"
GARAGE_RELEASE="${REPO_FOLDER}/target/release/"
PATH="${GARAGE_DEBUG}:${GARAGE_RELEASE}:$PATH"
+<<<<<<< HEAD
export AWS_ACCESS_KEY_ID=`cat /tmp/garage.s3 |cut -d' ' -f1`
export AWS_SECRET_ACCESS_KEY=`cat /tmp/garage.s3 |cut -d' ' -f2`
export AWS_DEFAULT_REGION='garage'
alias s3grg="aws s3 \
- --endpoint-url http://127.0.0.1:3900"
+ --endpoint-url http://127.0.0.1:3911"