From 90decd968b4337b28e0f5fcba78cf54d3378c48a Mon Sep 17 00:00:00 2001
From: Sinisa Veseli <sveseli@aps.anl.gov>
Date: Thu, 2 Mar 2017 03:15:25 +0000
Subject: [PATCH] preparing for the release

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

diff --git a/doc/RELEASE_NOTES.txt b/doc/RELEASE_NOTES.txt
index c48e1db6..93011612 100644
--- a/doc/RELEASE_NOTES.txt
+++ b/doc/RELEASE_NOTES.txt
@@ -1,6 +1,13 @@
 Release 1.1 ()
 =============================
 
+- Introduced integration with Beamline Scheduling System:
+  - New commands: 
+        - list-runs
+        - list-proposals
+        - get-proposal
+  - Modified add-experiment command to automatically add users associated
+    with a given beamline proposal
 - Added the following functionality for managing DAQs:
   - Max. run time specification causes DAQ to be stopped automatically
   - Target directory specification causes files to be uploaded into
diff --git a/etc/dm.deploy.conf b/etc/dm.deploy.conf
index 8059ab1a..718b1ac4 100644
--- a/etc/dm.deploy.conf
+++ b/etc/dm.deploy.conf
@@ -17,5 +17,5 @@ DM_CAT_WEB_SERVICE_HOST=DM_HOSTNAME
 DM_CAT_WEB_SERVICE_PORT=44436
 DM_PROC_WEB_SERVICE_HOST=DM_HOSTNAME
 DM_PROC_WEB_SERVICE_PORT=55536
-DM_SOFTWARE_VERSION="1.0 (DM_DATE)"
+DM_SOFTWARE_VERSION="1.1 (DM_DATE)"
 
-- 
GitLab