From d90e75c670d841979bfc22ce5a11dad422c030f3 Mon Sep 17 00:00:00 2001
From: Sinisa Veseli <sveseli@aps.anl.gov>
Date: Fri, 6 Jan 2017 15:11:15 +0000
Subject: [PATCH] preparing for the release

---
 doc/RELEASE_NOTES.txt | 9 +++++++++
 etc/dm.deploy.conf    | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/doc/RELEASE_NOTES.txt b/doc/RELEASE_NOTES.txt
index 2c15210e..d1b0a3f2 100644
--- a/doc/RELEASE_NOTES.txt
+++ b/doc/RELEASE_NOTES.txt
@@ -1,3 +1,12 @@
+Release 1.0 (15/1/2017)
+=============================
+
+- Introduced concept of experiment station and redesigned authorization 
+  mechanisms to allow beamline managers to manage their stations; all
+  APIs and CLIs now conform to the new authorization scheme
+- Modified get-experiments utility to allow retrieving list of experiments
+  for a given station
+
 Release 0.15 (11/1/2016)
 =============================
 
diff --git a/etc/dm.deploy.conf b/etc/dm.deploy.conf
index 4d955a80..37c4f7de 100644
--- a/etc/dm.deploy.conf
+++ b/etc/dm.deploy.conf
@@ -15,5 +15,5 @@ DM_DAQ_WEB_SERVICE_HOST=DM_HOSTNAME
 DM_DAQ_WEB_SERVICE_PORT=33336
 DM_CAT_WEB_SERVICE_HOST=DM_HOSTNAME
 DM_CAT_WEB_SERVICE_PORT=44436
-DM_SOFTWARE_VERSION="0.16 (DM_DATE)"
+DM_SOFTWARE_VERSION="1.0 (DM_DATE)"
 
-- 
GitLab