Bug 1039356 - Skip the failed CPAN modules to allow build to finish
Merge pull request #5888 from mfojtik/cpan

Merged by openshift-bot
admin-console: allow multiple app search results

https://bugzilla.redhat.com/show_bug.cgi?id=1153287
Bug 1153287 - Applications with the same alias are only listed once in
the administration console
Merge pull request #6020 from sosiouxme/bz1153287-admin-console-aliases

Merged by openshift-bot
Remove extra unused file
Change PHP 5.4 APC+OPCache memory comsumption formula

Both opcode cache and user cache should consume the same amout of memory
for both PHP 5.3 and PHP 5.4.

PHP 5.3 gears:
  small:  APC (opcode cache + user cache) => 64M
  medium: APC (opcode cache + user cache) => 128M
  large:  APC (opcode cache + user cache) => 256M

PHP 5.4 gears:
  small:  Zend OPCache (opcode cache) 32M  + APC (user cache) 32M  => 64M
  medium: Zend OPCache (opcode cache) 64M  + APC (user cache) 64M  => 128M
  large:  Zend OPCache (opcode cache) 128M + APC (user cache) 128M => 256M
Fix bug 1173796

https://bugzilla.redhat.com/show_bug.cgi?id=1173796
Merge pull request #6023 from VojtechVitek/opcache

Merged by openshift-bot
Revert "we do not want %ghost-ed log files"

This reverts commit 0550ff74df3acb60f391dcd4b1f297ae881b36ea.
We do in fact want the log files to be %ghost so they are not
overwritten on every update.

Bug 1134578 - The Broker's user_action.log should not be overwritten on RPM upgrade
https://bugzilla.redhat.com/show_bug.cgi?id=1134578
Merge pull request #6025 from sosiouxme/bz1134578-updates-overwite-logs

Merged by openshift-bot
Bug 1175489: Wrong grep regexp in jbossews
Merge pull request #6026 from jhadvig/BZ1175489

Merged by openshift-bot