Merge branch 'release/1.1.0' into develop

adhearsion · Apr 4, 2013 · 73e9559 · 73e9559
2 parents 6f9bcad + 795a11a
commit 73e9559
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # develop
 
+# 1.1.0
+  * Feature: Allow specifying an event mask (other than 'ALL') when connecting
+  * CS: Minor performance improvements from removing repeated regex compilation
+
 # 1.0.5
   * Bugfix: Allow sending large app arguments. Application arguments (headers in general) are limited to 2048 bytes. The work-around is to send them in the body of the message with a content-length header.
   * CS: Avoid Celluloid deprecation warnings

diff --git a/lib/ruby_fs/version.rb b/lib/ruby_fs/version.rb
@@ -1,3 +1,3 @@
 module RubyFS
-  VERSION = "1.0.5"
+  VERSION = "1.1.0"
 end