From f9fcb8d85a0e78d37b03cbe3f60f749bbdd08dd7 Mon Sep 17 00:00:00 2001
From: Etienne Vrignaud <evrignaud@gmail.com>
Date: Mon, 10 Oct 2016 23:10:42 +0200
Subject: [PATCH] :package: Release version 1.2.1

---
 pom.xml                                  |  2 +-
 src/main/asciidoc/docs/en/changelog.adoc | 21 +++++++++++++++++++++
 src/main/assembly/assembly-dist.xml      |  7 +++++++
 3 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 376c6cfa..9d726332 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>org.fim</groupId>
     <artifactId>fim</artifactId>
-    <version>1.2.1-SNAPSHOT</version>
+    <version>1.2.1</version>
 
     <name>Fim</name>
     <packaging>jar</packaging>
diff --git a/src/main/asciidoc/docs/en/changelog.adoc b/src/main/asciidoc/docs/en/changelog.adoc
index e764a7e5..f030eae7 100644
--- a/src/main/asciidoc/docs/en/changelog.adoc
+++ b/src/main/asciidoc/docs/en/changelog.adoc
@@ -1,5 +1,26 @@
 = Fim changelog
 
+== Version 1.2.1
+*(Released 2016-10-10)*
+
+https://github.com/evrignaud/fim/tree/1.2.1[image:icons/octocat.png[GitHub] Sources]
+&nbsp;&nbsp; - &nbsp;&nbsp;
+https://github.com/evrignaud/fim/compare/1.2.0%2E%2E%2E1.2.1[image:icons/list.png[List] Full Changelog]
+&nbsp;&nbsp; - &nbsp;&nbsp;
+https://github.com/evrignaud/fim/releases/tag/1.2.1[image:icons/package.png[Package] Download]
+
+=== General
+* 'diff' command deprecated in favor of the 'status' command
+* Fix https://github.com/evrignaud/fim/issues/6[issue #6] - Add commitDetails into the State in order to display more details regarding each commit while running 'fim log'.
+The 'log' command displays now the same output as the 'status' command. It works completely with States generated with this version of Fim
+* Thanks to @ch3v, clarified the 'find-duplicates' command output and sort duplicate sets by wasted space to display the biggest first
+* Fim is now able to *remove duplicates* that are in the repository see more in <<dealing-with-duplicates.adoc#_delete_duplicates_from_a_workspace,Delete duplicates from a workspace>>
+* Add http://evrignaud.github.io/fim/slides/fr[French slides]
+
+=== Bug fix
+* Update memory maximum sizes to more accurate values
+* In `fim-docker`, don't use the `realpath` command that is not installed by default
+
 == Version 1.2.0
 *(Released 2016-05-23)*
 
diff --git a/src/main/assembly/assembly-dist.xml b/src/main/assembly/assembly-dist.xml
index 4a4f433f..f3c7611a 100644
--- a/src/main/assembly/assembly-dist.xml
+++ b/src/main/assembly/assembly-dist.xml
@@ -54,5 +54,12 @@
                 <include>*.css</include>
             </includes>
         </fileSet>
+        <fileSet>
+            <directory>target/slides</directory>
+            <outputDirectory>slides</outputDirectory>
+            <includes>
+                <include>**/*</include>
+            </includes>
+        </fileSet>
     </fileSets>
 </assembly>