Branch: refs/heads/SLE-12-GA
Home: https://github.com/yast/yast-http-server
Commit: bc5554b2c3c63fbfaad89044acb02c2ad2336458
https://github.com/yast/yast-http-server/commit/bc5554b2c3c63fbfaad89044acb0...
Author: Jiri Srain
Date: 2015-01-28 (Wed, 28 Jan 2015)
Changed paths:
M package/yast2-http-server.changes
M src/modules/HttpServer.rb
Log Message:
-----------
do not stop reading settings when new configuration file got confirmed by user (bsc#770331)
Commit: d939a65a02b330a1437994cf9a9645f69a317eb2
https://github.com/yast/yast-http-server/commit/d939a65a02b330a1437994cf9a96...
Author: Jiri Srain
Date: 2015-01-30 (Fri, 30 Jan 2015)
Changed paths:
M package/yast2-http-server.changes
M package/yast2-http-server.spec
M src/include/http-server/complex.rb
M src/modules/HttpServer.rb
Log Message:
-----------
Merge remote-tracking branch 'upstream/SLE-12-GA' into SLE-12-GA
Conflicts:
package/yast2-http-server.changes
Commit: a1f0ed661ee4fb72046a2529985d421958825adf
https://github.com/yast/yast-http-server/commit/a1f0ed661ee4fb72046a2529985d...
Author: Jiří Šrain
Date: 2015-01-30 (Fri, 30 Jan 2015)
Changed paths:
M package/yast2-http-server.changes
M src/modules/HttpServer.rb
Log Message:
-----------
Merge pull request #18 from jsrain/SLE-12-GA
do not stop reading settings when new configuration file got confirmed by user (bsc#770331)
Compare: https://github.com/yast/yast-http-server/compare/75187e92d95b...a1f0ed661ee4
