Merge branch 'maint-1.1'
- maint-1.1: installation: disable SSLv2/SSLv3 in Apache config
Conflicts:
modules/miscutil/lib/inveniocfg.py
Signed-off-by: Tibor Simko <tibor.simko@cern.ch>
Description
Description
Details
Details
- Committed
Tibor Simko <tibor.simko@cern.ch> Jan 15 2015, 18:11 - Parents
- R3600:521a0ee4535a: Merge branch 'maint-1.0' into maint-1.1
R3600:386ac9d5ef10: global: removal of INSERT DELAYED SQL statements - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 521a0ee4535a | Tibor Simko | Merge branch 'maint-1.0' into maint-1.1 | Jan 15 2015 | |||
| 577632fca777 | Tibor Simko | installation: disable SSLv2/SSLv3 in Apache config | Jan 15 2015 |