Merge branch 'develop' into issue-351

Pazus · web-flow · commit 37f14a9a3299 · 2017-07-02T16:54:53.000+03:00
diff --git a/.travis.yml b/.travis.yml
@@ -41,7 +41,7 @@ env:
   matrix:
     - ORACLE_VERSION="11g-xe-r2"     CONNECTION_STR='127.0.0.1:1521/XE'       DOCKER_OPTIONS='--shm-size=1g'
     - ORACLE_VERSION="12c-se2-r1-v2" CONNECTION_STR='127.0.0.1:1521/ORCLPDB1' DOCKER_OPTIONS="-v /dev/pdbs:/opt/oracle/oradata/pdbs" 
-    - ORACLE_VERSION="12c-se2-r2-v2" CONNECTION_STR='127.0.0.1:1521/ORCLPDB1' DOCKER_OPTIONS="-v /dev/pdbs:/opt/oracle/oradata/pdbs"
+    - ORACLE_VERSION="12c-se-r2-v4" CONNECTION_STR='127.0.0.1:1521/ORCLPDB1' DOCKER_OPTIONS="-v /dev/pdbs:/opt/oracle/oradata/pdbs"
 
 cache:
   pip: true
@@ -55,6 +55,7 @@ install:
   - sudo mkdir -p /dev/pdbs
   - sudo chmod -R 777 /dev/pdbs
   - if [ "${TRAVIS_TAG}" = "" ]; then bash .travis/start_db.sh; fi
+  - df -h
 
 before_script:
   #The update_project_version is done before deployment to validate that the change of project files does not break installation
diff --git a/source/install_headless.sql b/source/install_headless.sql
@@ -14,7 +14,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 */
-define ut3_user       = ut3
+define ut3_owner      = ut3
 define ut3_password   = XNtxj8eEgA6X6b6f
 define ut3_tablespace = users
 
