merged from 0.11 branch

doc/RELEASE_NOTES.txt

@@ -7,6 +7,8 @@ Release 0.11 (04/29/2016)
   starvation between simultaneous DAQs and uploads
 - Added new polling file system observer agent as option for monitoring 
   directories
+- Reworked catalog API and corresponding MongoDB interfaces to use unique 
+  experiment file paths, rather than file names
 
 Release 0.10 (03/11/2016)
 =============================

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.10 (DM_DATE)"
+DM_SOFTWARE_VERSION="0.12 (DM_DATE)"
 

src/python/dm/__init__.py

-__version__ = "0.10 (2016.03.21)"
+__version__ = "0.11 (2016.04.28)"

src/python/dm/daq_web_service/service/impl/experimentSessionControllerImpl.py

@@ -136,6 +136,7 @@ class ExperimentSessionControllerImpl(DmObjectManager):
 
         try:
             # Get files
+            self.logger.debug('Retrieving file paths for %s' % dataDirectory)
             filePathsDict = FileSystemObserver.getInstance().getFiles(dataDirectory)
 
             # Remove hidden files