Repository: tajo Updated Branches: refs/heads/master 8ac868352 -> ae7862b28
TAJO-1328: Fix deprecated property names in the catalog configuration document Closes #373 Project: http://git-wip-us.apache.org/repos/asf/tajo/repo Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/ae7862b2 Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/ae7862b2 Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/ae7862b2 Branch: refs/heads/master Commit: ae7862b284371069522a853df6a1db8249428644 Parents: 8ac8683 Author: Jihun Kang <[email protected]> Authored: Wed Feb 4 10:30:52 2015 +0900 Committer: Jihun Kang <[email protected]> Committed: Wed Feb 4 10:30:52 2015 +0900 ---------------------------------------------------------------------- CHANGES | 3 +++ .../main/sphinx/configuration/catalog_configuration.rst | 12 ++++++------ 2 files changed, 9 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/ae7862b2/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index 07c34ec..85d6684 100644 --- a/CHANGES +++ b/CHANGES @@ -27,6 +27,9 @@ Release 0.10.0 - unreleased IMPROVEMENT + TAJO-1328: Fix deprecated property names in the catalog configuration + document. (jihun) + TAJO-1317: Parallel Test Executions on Tajo Core Project. (jihun) TAJO-1320: HBaseStorageManager need to support Zookeeper Client Port. http://git-wip-us.apache.org/repos/asf/tajo/blob/ae7862b2/tajo-docs/src/main/sphinx/configuration/catalog_configuration.rst ---------------------------------------------------------------------- diff --git a/tajo-docs/src/main/sphinx/configuration/catalog_configuration.rst b/tajo-docs/src/main/sphinx/configuration/catalog_configuration.rst index 9c3b6cf..c629d9e 100644 --- a/tajo-docs/src/main/sphinx/configuration/catalog_configuration.rst +++ b/tajo-docs/src/main/sphinx/configuration/catalog_configuration.rst @@ -99,11 +99,11 @@ Finally, you must add the following configurations to `conf/catalog-site.xml` : .. code-block:: xml <property> - <name>tajo.catalog.jdbc.connection.id</name> + <name>tajo.catalog.connection.id</name> <value><user name></value> </property> <property> - <name>tajo.catalog.jdbc.connection.password</name> + <name>tajo.catalog.connection.password</name> <value><user password></value> </property> @@ -113,7 +113,7 @@ Finally, you must add the following configurations to `conf/catalog-site.xml` : <value>org.apache.tajo.catalog.store.MySQLStore</value> </property> <property> - <name>tajo.catalog.jdbc.uri</name> + <name>tajo.catalog.uri</name> <value>jdbc:mysql://<mysql host name>:<mysql port>/<database name for tajo>?createDatabaseIfNotExist=true</value> </property> @@ -123,7 +123,7 @@ Finally, you must add the following configurations to `conf/catalog-site.xml` : <value>org.apache.tajo.catalog.store.MariaDBStore</value> </property> <property> - <name>tajo.catalog.jdbc.uri</name> + <name>tajo.catalog.uri</name> <value>jdbc:mariadb://<mariadb host name>:<mariadb port>/<database name for tajo>?createDatabaseIfNotExist=true</value> </property> @@ -133,7 +133,7 @@ Finally, you must add the following configurations to `conf/catalog-site.xml` : <value>org.apache.tajo.catalog.store.PostgreSQLStore</value> </property> <property> - <name>tajo.catalog.jdbc.uri</name> + <name>tajo.catalog.uri</name> <value>jdbc:postgresql://<postgresql host name>:<postgresql port>/<database name for tajo>?createDatabaseIfNotExist=true</value> </property> @@ -143,7 +143,7 @@ Finally, you must add the following configurations to `conf/catalog-site.xml` : <value>org.apache.tajo.catalog.store.OracleStore</value> </property> <property> - <name>tajo.catalog.jdbc.uri</name> + <name>tajo.catalog.uri</name> <value>jdbc:oracle:thin:@//<oracle host name>:<oracle port>/<ServiceName for tajo database></value> </property>
