[tor-commits] [metrics-lib/master] Prepare for 1.1.0 release.

[karsten at torproject.org]

commit d5f89d1eb73849bd48d627f52e28d0b2e2c25861
Author: Karsten Loesing <karsten.loesing at gmx.net>
Date:   Mon Dec 28 09:19:39 2015 +0100

    Prepare for 1.1.0 release.
---
 CHANGELOG.md |    2 +-
 build.xml    |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cb49133..4daab24 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-# Changes in version 1.x.x - 201x-xx-xx
+# Changes in version 1.1.0 - 2015-12-28
 
  * Medium changes
    - Parse flag thresholds in bridge network statuses, and parse the
diff --git a/build.xml b/build.xml
index a6e0ac0..85918a7 100644
--- a/build.xml
+++ b/build.xml
@@ -1,5 +1,5 @@
 <project default="jar" name="descriptor" basedir=".">
-  <property name="release.version" value="1.0.0-dev" />
+  <property name="release.version" value="1.1.0" />
   <property name="sources" value="src"/>
   <property name="classes" value="classes"/>
   <property name="tests" value="test"/>