Merge branch 'master' into next
- master: inveniocfg: fix for mod_headers
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> Sep 17 2013, 15:38 - Parents
- R3600:ec0bf6f936fe: Merge branch 'maint-1.1'
R3600:0b36c9ac263b: Merge branch 'master' into next - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| ec0bf6f936fe | Tibor Simko | Merge branch 'maint-1.1' | Sep 17 2013 | |||
| a0c53e9f1d97 | Thorsten Schwander/Tibor Simko | inveniocfg: fix for mod_headers | Sep 17 2013 |