diff options
author | Aaron Patterson <aaron.patterson@gmail.com> | 2014-04-08 20:49:26 -0700 |
---|---|---|
committer | Aaron Patterson <aaron.patterson@gmail.com> | 2014-04-08 20:49:26 -0700 |
commit | 2b61973597f1204f9ac58f517716e6d7811239e4 (patch) | |
tree | 8feee57649c19ad1611ced180c69469722744f4d /History.txt | |
parent | d6a9267aec4bf845926cef725a2d733a6a7ef361 (diff) | |
parent | 2d80dc0cd29895230eaaae4595e249d582439298 (diff) | |
download | rails-2b61973597f1204f9ac58f517716e6d7811239e4.tar.gz rails-2b61973597f1204f9ac58f517716e6d7811239e4.tar.bz2 rails-2b61973597f1204f9ac58f517716e6d7811239e4.zip |
Merge branch 'master' into collector
* master:
loop over cores twice to make the collector implementation more convenient
Diffstat (limited to 'History.txt')
0 files changed, 0 insertions, 0 deletions