Merge pull request #805 from nomis52/0.9.6

Bump version and cleanup NEWS

NEWS

@@ -1,11 +1,9 @@
-x/y/2015 ola-0.9.6
+30/6/2015 ola-0.9.6
  Features:
- * Default to using epoll() and kqueue() rather than select() if they exist,
-   apart from for the HTTP thread.
+ * Default to using epoll() rather than select() if it exists,
  * Default to the async libusb implementation in the usbdmx plugin.
  * Added support for the APA102 family of SPI pixels.
- * Show the plugin enabled/disable state in the new web UI.
- * Allow plugins to be enabled/disabled from the CLI tools while running #682.
+ * Allow plugins to be enabled/disabled from the new web UI & CLI tools #682.
  * Add an option to display the frame and timing data in the RDM CLI tools
    where available.
  * Add additional C++ client documentation and examples.
@@ -14,7 +12,7 @@ x/y/2015 ola-0.9.6
  * Initial partial E1.37-2 support in the web UI.
 
  API:
- * Python: callbacks are now also systematically called when the RPC calls fail.
+ * Python: Fix a bug where callbacks weren't run if the operation failed.
  * Python: improve Python 3 compatability.
  * Add patched ports in Universe protobuf message.
  * Python: Add a patch/unpatch example.
@@ -40,7 +38,7 @@ x/y/2015 ola-0.9.6
  Internal:
  * Rename the method Source to ConfigLocation for Preference classes and
    associated changes.
- * Various RDM cleanup.
+ * Major cleanup of RDM code.
  * Switch to using pthread_equal rather than operator==.
  * Switch to using Dot for Doxygen diagrams where present.
 

config/ola_version.m4

@@ -19,7 +19,7 @@
 # -----------------------------------------------------------------------------
 m4_define([ola_major_version], [0])
 m4_define([ola_minor_version], [9])
-m4_define([ola_revision_version], [5])
+m4_define([ola_revision_version], [6])
 
 m4_define([ola_version],
       [ola_major_version.ola_minor_version.ola_revision_version])