From 5df3d70ec5588f583bce6b528670f14a9ef1cdeb Mon Sep 17 00:00:00 2001
From: Sinisa Veseli <sveseli@aps.anl.gov>
Date: Mon, 27 Feb 2017 15:37:36 +0000
Subject: [PATCH] added api/impl classes for BSS integration

---
 RELEASE_NOTES.txt                | 14 ++++++++++++++
 sphinx/.svnignore                |  2 ++
 sphinx/source/dm.aps_bss.api.rst | 12 ++++++++++++
 sphinx/source/index.rst          |  1 +
 4 files changed, 29 insertions(+)
 create mode 100644 sphinx/.svnignore
 create mode 100644 sphinx/source/dm.aps_bss.api.rst

diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt
index 175db19f..c48e1db6 100644
--- a/RELEASE_NOTES.txt
+++ b/RELEASE_NOTES.txt
@@ -1,3 +1,17 @@
+Release 1.1 ()
+=============================
+
+- 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
+    a specific directory relative to experiment root path
+  - Upload data/target directory on exit specify upload of the given
+    directory automatically after DAQ completes
+- Added the following functionality for managing uploads:
+  - Target directory specification causes files to be uploaded into
+    a specific directory relative to experiment root path
+- Introduced sphinx as python API documentation framework
+
 Release 1.0 (01/31/2017)
 =============================
 
diff --git a/sphinx/.svnignore b/sphinx/.svnignore
new file mode 100644
index 00000000..9ef96044
--- /dev/null
+++ b/sphinx/.svnignore
@@ -0,0 +1,2 @@
+build
+
diff --git a/sphinx/source/dm.aps_bss.api.rst b/sphinx/source/dm.aps_bss.api.rst
new file mode 100644
index 00000000..00946b37
--- /dev/null
+++ b/sphinx/source/dm.aps_bss.api.rst
@@ -0,0 +1,12 @@
+.. automodule:: dm.aps_bss.api
+
+.. currentmodule:: dm.aps_bss.api
+
+ApsBssApi
+---------
+
+.. autoclass:: dm.aps_bss.api.apsBssApi.ApsBssApi()
+    :show-inheritance: 
+    :members:  __init__, listRuns, getCurrentRun, listBeamlineProposals, getBeamlineProposal
+
+
diff --git a/sphinx/source/index.rst b/sphinx/source/index.rst
index d9d39b90..d7220f53 100644
--- a/sphinx/source/index.rst
+++ b/sphinx/source/index.rst
@@ -13,6 +13,7 @@ The `dm` package contains python APIs for accessing Data Management services.
    :caption: Contents:
 
    dm.daq_web_service.api
+   dm.aps_bss.api
 
 Indices and tables
 ==================
-- 
GitLab