[tor-commits] [collector/master] Prepare for 1.0.2 release.

[karsten at torproject.org]

commit c43d0ad995e78f6e94b013cedc72ed0fbe922f4b
Author: Karsten Loesing <karsten.loesing at gmx.net>
Date:   Fri Oct 7 10:42:00 2016 +0200

    Prepare for 1.0.2 release.
---
 .gitignore   | 5 +++--
 CHANGELOG.md | 2 +-
 build.xml    | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index e4e7512..a3acc9a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,12 +1,12 @@
 /.classpath
 /.project
 /classes/
-/config
+/collector.properties
 /data/
 /in/
 /out/
 /log/
-/rsync/
+/recent/
 /stats/
 /tarballs/
 /generated
@@ -14,4 +14,5 @@
 cobertura.ser
 *~
 build.properties
+/index.json*
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a75a1fd..33e77f6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-# Changes in version 1.1.0 - 2016-09-xx
+# Changes in version 1.0.2 - 2016-10-07
 
  * Medium changes
    - Add support for Bifroest's bridge descriptor tarballs.
diff --git a/build.xml b/build.xml
index 83f2907..ac6d8e0 100644
--- a/build.xml
+++ b/build.xml
@@ -1,7 +1,7 @@
 <project default="compile" name="CollecTor" basedir=".">
-  <property name="release.version" value="1.1.0-dev" />
+  <property name="release.version" value="1.0.2" />
   <property name="name" value="CollecTor"/>
-  <property name="descriptorversion" value="1.3.1" />
+  <property name="descriptorversion" value="1.4.0" />
   <property name="source-and-target-java-version" value="1.7" />
   <property name="sources" value="src/main/java"/>
   <property name="resources" value="src/main/resources/"/>