| commit | 8980bbb34ccfa6df04911b0b4a5e7b640057787d | [log] [tgz] |
|---|---|---|
| author | Till Westmann <till@westmann.org> | Fri Nov 08 11:32:13 2013 -0800 |
| committer | Till Westmann <till@westmann.org> | Fri Nov 08 11:32:13 2013 -0800 |
| tree | fc24f6ddd590cb88cc989285207f0c8b0a4df902 | |
| parent | 3e67bc4590736393c06ed2bc530af47cfdecc8b1 [diff] | |
| parent | ff9010e2872e63fe396d77a5fd9944951ea61407 [diff] |
Merge branch 'raman/master/cluster_active_wait' into westmann/scratch