Ignore:
Timestamp:
01/17/09 18:51:08 (3 years ago)
Author:
Tomash Brechko <tomash.brechko@…>
Branches:
master-v0.7, upstream_count_limit
Children:
f54237
Parents:
3f2f24 (diff), 2e1f23 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
git-author:
Tomash Brechko <tomash.brechko@…> (01/17/09 18:51:08)
git-committer:
Tomash Brechko <tomash.brechko@…> (01/17/09 18:51:08)
Message:

Merge branch 'memcached_hash' into master-v0.7

Conflicts:

memcached_hash/dist.sh

File:
1 edited

Legend:

Unmodified
Added
Removed
  • memcached_hash/dist.sh

    r817d03 rb3765f  
    11#! /bin/sh 
     2 
     3BRANCH=$1 
     4if [ "x$BRANCH" = "x" ]; then 
     5    echo "Usage: $0 NGINX-BRANCH" 
     6    exit 1 
     7fi 
    28 
    39PWD=`pwd` 
Note: See TracChangeset for help on using the changeset viewer.