Skip to content

Fixed incorrectly resolved conflicts #123

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mangchiandjjoe merged 1 commit into from
Feb 23, 2017
Merged

Fixed incorrectly resolved conflicts #123

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions script/release-binary
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ sha256sum "${BINARY_NAME}" > "${SHA256_NAME}"
# Copy it to the bucket.
echo "Copying ${BINARY_NAME} ${SHA256_NAME} to ${DST}/"
gsutil cp "${BINARY_NAME}" "${SHA256_NAME}" "${DST}/"
<<<<<<< HEAD

# Build the debug binary
BINARY_NAME="envoy-debug-${SHA}.tar.gz"
Expand All @@ -57,5 +56,3 @@ sha256sum "${BINARY_NAME}" > "${SHA256_NAME}"
# Copy it to the bucket.
echo "Copying ${BINARY_NAME} ${SHA256_NAME} to ${DST}/"
gsutil cp "${BINARY_NAME}" "${SHA256_NAME}" "${DST}/"
=======
>>>>>>> origin/rate_limiting