Merge branch 'ods-810-upgrade-to-1.1.0'

Author: Robert Levy

README.textile

@@ -5,6 +5,7 @@ h2. Compatibility
 The following table shows the versions of elasticsearch and jetty that Jetty Plugin was built with.
 
 |_. Jetty Plugin |_.  Elasticsearch    |_.  Jetty  |
+| 1.1.0-beta | 1.1.0    | 8.1.14.v20131031 |
 | 1.0.1    | 1.0.1    | 8.1.14.v20131031 |
 | 0.90.12   | 0.90.12   | 8.1.14.v20131031   |
 | 0.90.0   | 0.90.0   | 8.1.4.v20120524   |

pom.xml

@@ -6,7 +6,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.sonian</groupId>
   <artifactId>elasticsearch-jetty</artifactId>
-  <version>1.0.1-beta</version>
+  <version>1.1.0-beta</version>
   <packaging>jar</packaging>
   <description>Jetty plugin for ElasticSearch</description>
   <inceptionYear>2011</inceptionYear>
@@ -70,7 +70,7 @@
   </parent>
 
   <properties>
-    <elasticsearch.version>1.0.1</elasticsearch.version>
+    <elasticsearch.version>1.1.0</elasticsearch.version>
     <jetty.version>8.1.14.v20131031</jetty.version>
     <github.global.server>github</github.global.server>
   </properties>