Merge pull request #2 from rhyolight/issue-837

Merge in master
numenta · Jul 3, 2014 · 2e2d161 · 2e2d161
2 parents 2b7702a + 6316a76
commit 2e2d161
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,7 +6,6 @@ language: cpp
 
 os:
   - linux
-  - osx
 
 compiler:
   - clang

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -910,8 +910,8 @@ copy_directory(${REPOSITORY_DIR}/scripts ${PROJECT_BUILD_RELEASE_DIR}/scripts)
 # Copy miscellaneous files
 copy_directory(${REPOSITORY_DIR}/extensions/core/external/licenses ${PROJECT_BUILD_RELEASE_DIR}/share/doc/licenses)
 copy_directory(${REPOSITORY_DIR}/external/licenses ${PROJECT_BUILD_RELEASE_DIR}/share/doc/licenses)
-copy_file(${REPOSITORY_DIR}/conf/default/nupic-default.xml ${PROJECT_BUILD_RELEASE_DIR}/conf/default/nupic-default.xml)
-copy_file(${REPOSITORY_DIR}/conf/default/nupic-logging.conf ${PROJECT_BUILD_RELEASE_DIR}/conf/default/nupic-logging.conf)
+copy_file(${REPOSITORY_DIR}/config/default/nupic-default.xml ${PROJECT_BUILD_RELEASE_DIR}/config/default/nupic-default.xml)
+copy_file(${REPOSITORY_DIR}/config/default/nupic-logging.conf ${PROJECT_BUILD_RELEASE_DIR}/config/default/nupic-logging.conf)
 
 
 ############################################################################################################################

diff --git a/nupic/database/ClientJobsDAO.py b/nupic/database/ClientJobsDAO.py
@@ -543,6 +543,9 @@ def __getDBNameForVersion(cls, dbVersion):
     # DB Name suffix
     suffix = Configuration.get('nupic.cluster.database.nameSuffix')
 
+    # Replace dash with underscore (dash will break SQL e.g. 'ec2-user')
+    suffix = suffix.replace("-", "_")
+
     # Create the name of the database for the given DB version
     dbName = '%s_%s' % (prefix, suffix)