Three

[cuitao2046]

Trying to add a small feature to siege to support ramp-up period to make the full number of concurrent threads to avoid flood the server to be tested.

[JoeDog]

That didn't go so well. I'm not sure how to fix this merge:

$ git fetch origin
$ git checkout -b three origin/three
Branch three set up to track remote branch three from origin.
Switched to a new branch 'three'
$ git merge master
Auto-merging ChangeLog
CONFLICT (content): Merge conflict in ChangeLog
Removing KNOWNBUGS
Removing NEWS
Removing README.https
Removing doc/bombardment.1.in
Removing doc/layingsiege.7.in
Removing doc/siege.1.in
Removing doc/siege.config.1.in
Removing doc/siege2csv.1.in
Removing doc/urls_txt.5.in
Removing include/joedog/joedog.h
Removing lib/Makefile.am
Removing lib/joedog/Makefile.am
Removing lib/joedog/perl.h
Removing lib/joedog/snprintf.c
Removing lib/joedog/snprintf.h
Removing lib/joedog/util.c
Removing lib/joedog/util.h
Auto-merging src/auth.c
CONFLICT (content): Merge conflict in src/auth.c
Auto-merging src/cfg.c
CONFLICT (content): Merge conflict in src/cfg.c
CONFLICT (delete/modify): src/client.c deleted in master and modified in HEAD. Version HEAD of src/client.c left in tree.
Removing src/client.h
Auto-merging src/http.c
CONFLICT (content): Merge conflict in src/http.c
Auto-merging src/load.c
Auto-merging src/version.c
CONFLICT (content): Merge conflict in src/version.c
Automatic merge failed; fix conflicts and then commit the result.