Update changelog and documentation.

mesos · Nov 9, 2015 · bc492b1 · bc492b1
1 parent 8316231
commit bc492b1
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,19 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [0.6.0] - [09 November 2015]
+
+### Features
+- [Upgrade Mesos support to 0.25.0](https://github.com/mesos/elasticsearch/issues/338)
+
+### Enhanced
+- [Test Authentication in system tests](https://github.com/mesos/elasticsearch/issues/304)
+- [Test JAR-mode (no docker) in system tests](https://github.com/mesos/elasticsearch/issues/354)
+
+### Fixed
+- [Resolving executor IP address when using jar](https://github.com/mesos/elasticsearch/issues/388)
+- [Use hostname, use system to resolve hostnames](https://github.com/mesos/elasticsearch/issues/392)
+
 ## [0.5.2] - [29 October 2015]
 
 ### Fixed

diff --git a/docs/index.md b/docs/index.md
@@ -50,8 +50,6 @@
 - Rollback
 - Snapshot and restore 
 
-Rough timescales:
-
 ### Blocked features
 
 - [Persistent Volumes](https://github.com/mesos/elasticsearch/issues/228)
@@ -74,7 +72,7 @@ Rough timescales:
 
 ## Getting Started
 
-We recommend that users install via marathon or via the DCOS command line (coming soon!).
+We recommend that users install via marathon, using a docker container.
 
 This framework requires:
 
@@ -83,6 +81,10 @@ This framework requires:
 
 ## Users Guide
 
+### Mesos version support
+
+The framework currently supports Mesos 0.25.0. It may work with newer or older versions of Mesos, but the tests are only performed on this version.
+
 ### How to install on Marathon
 
 Create a Marathon file like the one below and fill in the IP addresses and other configuration. This is the minimum viable command; there are many more options.