Bump version, changelog

Author: pitr-ch

CHANGELOG.md

@@ -1,8 +1,16 @@
 ## Current
 
-concurrent-ruby-edge:
+concurrent-ruby:
 
+* [Promises](http://ruby-concurrency.github.io/concurrent-ruby/Concurrent/Promises.html)
+  are moved from `concurrent-ruby-edge` to `concurrent-ruby`
+* Fix Map#each and #each_pair not returning enumerator outside of MRI (#644)
 * (#659) Edge promises fail during error handling
+  
+concurrent-ruby-edge:
+
+* Edge files clearly separated in `lib-edge`
+* added ReInclude
 
 ## Release v1.0.5, edge v0.3.1 (26 Feb 2017)
 

lib/concurrent/version.rb

@@ -1,4 +1,4 @@
 module Concurrent
-  VERSION      = '1.0.5'
-  EDGE_VERSION = '0.3.1'
+  VERSION      = '1.1.0.pre1'
+  EDGE_VERSION = '0.4.0.pre1'
 end