Merge remote-tracking branch 'origin/master' into hardened-stdenv

This commit is contained in:
Franz Pletz
2016-05-18 17:10:02 +02:00
1470 changed files with 62103 additions and 28701 deletions
@@ -58,9 +58,9 @@ rec {
"${patchSet}/patches/ruby/2.2.3/railsexpress/02-improve-gc-stats.patch"
"${patchSet}/patches/ruby/2.2.3/railsexpress/03-display-more-detailed-stack-trace.patch"
];
"2.3.0" = ops useRailsExpress [
"${patchSet}/patches/ruby/2.3.0/railsexpress/01-skip-broken-tests.patch"
"${patchSet}/patches/ruby/2.3.0/railsexpress/02-improve-gc-stats.patch"
"${patchSet}/patches/ruby/2.3.0/railsexpress/03-display-more-detailed-stack-trace.patch"
"2.3.1" = ops useRailsExpress [
"${patchSet}/patches/ruby/2.3/head/railsexpress/01-skip-broken-tests.patch"
"${patchSet}/patches/ruby/2.3/head/railsexpress/02-improve-gc-stats.patch"
"${patchSet}/patches/ruby/2.3/head/railsexpress/03-display-more-detailed-stack-trace.patch"
];
}