Merge remote-tracking branch 'ungleich/master' into improve_hostfile

2016-08-19 21:57:24 +02:00 · 2016-08-19 21:57:24 +02:00 · 40c2eeeabd
parent 7f1e41f769 147460e3d0
commit 40c2eeeabd
2 changed files with 3 additions and 0 deletions
--- a/docs/changelog
+++ b/docs/changelog
@ -1,7 +1,10 @@
 Changelog
 ---------
+
 next:
 	* Core: Improve hostfile: support comments, skip empty lines (Darko Poljak)
+
+4.3.0: 2016-08-19
 	* Documentation: Add Parallelization chapter (Darko Poljak)
 	* Core: Add -b, --enable-beta option for enabling beta functionalities (Darko Poljak)
 	* Core: Add -j, --jobs option for parallel execution and add parallel support for global explorers (currently in beta) (Darko Poljak)
--- a/docs/speeches/2015-10-21-opennebulaconf-cdist.odp
+++ b/docs/speeches/2015-10-21-opennebulaconf-cdist.odp