summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge bzr://soup.haus/ Build: jenkins-Libmemcached-473HEADtrunkContinuous Integration2014-02-16123-84/+302
|\
| * Merge from 1.0Brian Aker2014-02-16123-84/+302
| |\ |/ /
| * Merge bzr://soup.haus/ Build: jenkins-Libmemcached-472Continuous Integration2014-02-16115-112/+212
| |\
| | * Fix for building docs.Brian Aker2014-02-16115-112/+212
| |/
| * Merge bzr://10.0.3.21 Build: jenkins-Libmemcached-469Continuous Integration2014-02-121-3/+1
| |\
| | * Fix for 1278834Brian Aker2014-02-121-3/+1
| |/
| * Merge bzr://10.0.3.21/ Build: jenkins-Libmemcached-468Continuous Integration2014-02-091-5/+8
| |\
| | * Merge from template.Brian Aker2014-02-091-3/+4
| | * Update how we remove files.Brian Aker2014-02-091-2/+4
| * | Merge bzr://10.0.3.21/ Build: jenkins-Libmemcached-467Continuous Integration2014-02-091-1/+1
| |\ \ | | |/
| | * Fix issue where we push rpm into artifact.Brian Aker2014-02-091-1/+1
| * | Merge bzr://10.0.3.21/ Build: jenkins-Libmemcached-466Continuous Integration2014-02-090-0/+0
| * | Merge bzr://10.0.3.21/ Build: jenkins-Libmemcached-465Continuous Integration2014-02-091-7/+6
| |\ \ | | |/
| | * Shift how rpm artifact is kept.Brian Aker2014-02-091-7/+6
| * | Merge bzr://10.0.3.21/ Build: jenkins-Libmemcached-464Continuous Integration2014-02-091-1/+2
| |\ \ | | |/
| | * Update for release.Brian Aker2014-02-091-1/+2
| |/
| * Merge bzr://10.0.3.21/ Build: jenkins-Libmemcached-4631.0.18Continuous Integration2014-02-097-47/+65
| |\
| | * Update RPM.Brian Aker2014-02-097-47/+65
| | |\
| | | * RPM update.Brian Aker2014-02-087-36/+57
| * | | Merge bzr://10.0.3.21/ Build: jenkins-Libmemcached-460Continuous Integration2014-02-084-10/+11
| |\ \ \ | | |/ / | | | / | | |/ | |/|
| | * Update RPM rules.Brian Aker2014-02-084-10/+11
| |/
| * Merge bzr://10.0.3.21/ Build: jenkins-Libmemcached-459Continuous Integration2014-02-070-0/+0
| * Merge bzr://10.0.3.21/ Build: jenkins-Libmemcached-457Continuous Integration2014-02-071-21/+12
| |\
| | * Update bootstrap.Brian Aker2014-02-071-21/+12
| * | Merge bzr://10.0.3.21/ Build: jenkins-Libmemcached-456Continuous Integration2014-02-061-0/+6
| |\ \ | | |/
| | * Fix RPM buidl so that PHONY is declared.Brian Aker2014-02-061-0/+6
| |/
* | Merge lp:~vbernat/libmemcached/fix-memaslap-tps Build: jenkins-Libmemcached-455Continuous Integration2014-02-063-1/+26
|\ \
| * | Don't account for time in throttled state.Vincent Bernat2014-01-113-0/+25
| * | Fix how current tps is computed.Vincent Bernat2014-01-111-1/+1
* | | Merge bzr://10.0.3.21/ Build: jenkins-Libmemcached-454Continuous Integration2014-02-0644-209/+449
|\ \ \ | |/ / |/| |
| * | Merge from 1.0Brian Aker2014-02-0513-8/+38
| |\ \ | | |/
| | * Merge lp:~brianaker/libmemcached/feature-server_timeout Build: jenkins-Libmem...Continuous Integration2014-02-050-0/+0
| | * Merge lp:~brianaker/libmemcached/feature-server_timeout Build: jenkins-Libmem...Continuous Integration2014-02-0413-8/+38
| | |\
| | | * Fix issue where we missed MEMCACHED_BEHAVIOR_SERVER_TIMEOUT_LIMIT from a swit...Brian Aker2014-02-041-0/+1
| | | * Added server_timeout_counter and behavior MEMCACHED_BEHAVIOR_SERVER_TIMEOUT_L...Nicolas Van Eenaeme2013-11-2013-8/+37
| | |/
| * | Merge with 1.0Brian Aker2014-02-0337-205/+415
| |\ \ |/ / / | | _
| * Merge lp:~493pocbrcycmdw7yksonho9o2qzz-o18bz-d18ecat4t1b76tkfi3vttrkfngli/lib...Continuous Integration2014-02-023-3/+27
| |\
| | * Small bugfixes for errno (since memcached_quit_server() modifies errno)Nicolas Van Eenaeme2013-11-201-3/+6
| | * Added the ability to get the local port of a memcache_instance_st.Nicolas Van Eenaeme2013-11-192-0/+21
| * | Merge lp:~brianaker/libmemcached/1261128 Build: jenkins-Libmemcached-442Continuous Integration2014-02-011-4/+4
| |\ \
| | * | Fix copy/paste error.Brian Aker2014-02-021-4/+4
| * | | Merge lp:~brianaker/libmemcached/1244776 Build: jenkins-Libmemcached-441Continuous Integration2014-02-011-1/+1
| |\ \ \ | | |/ /
| | * | Remove line that get un-commented out.Brian Aker2014-02-021-1/+1
| * | | Merge lp:~brianaker/libmemcached/1251488 Build: jenkins-Libmemcached-440Continuous Integration2014-02-011-2/+0
| |\ \ \ | | |/ /
| | * | Remove Automatic parallelization in GraphiteBrian Aker2014-02-021-2/+0
| * | | Merge lp:~brianaker/libmemcached/1251482 Build: jenkins-Libmemcached-439Continuous Integration2014-02-012-1/+24
| |\ \ \ | | |/ /
| | * | Store data.Brian Aker2014-02-012-1/+24
| * | | Merge lp:~brianaker/libmemcached/1215783 Build: jenkins-Libmemcached-438Continuous Integration2014-02-0112-87/+238
| |\ \ \ | | |/ /
| | * | Just write it myself (so much for coppying).Brian Aker2014-02-011-23/+25
| | * | Remove line ending.Brian Aker2014-02-011-2/+1