Repository: sqoop Updated Branches: refs/heads/sqoop2 33d2b12ca -> 3ed59d609
SQOOP-2695: Sqoop2: Doc: Clean up git warnings for doc files (Jarek Jarcec Cecho via Kate Ting) Project: http://git-wip-us.apache.org/repos/asf/sqoop/repo Commit: http://git-wip-us.apache.org/repos/asf/sqoop/commit/3ed59d60 Tree: http://git-wip-us.apache.org/repos/asf/sqoop/tree/3ed59d60 Diff: http://git-wip-us.apache.org/repos/asf/sqoop/diff/3ed59d60 Branch: refs/heads/sqoop2 Commit: 3ed59d609025648199c74ddbb46a178f4d326d09 Parents: 33d2b12 Author: Kate Ting <[email protected]> Authored: Wed Dec 9 06:35:13 2015 -0800 Committer: Kate Ting <[email protected]> Committed: Wed Dec 9 06:35:13 2015 -0800 ---------------------------------------------------------------------- docs/src/site/sphinx/admin/Installation.rst | 2 -- docs/src/site/sphinx/admin/Tools.rst | 6 ------ docs/src/site/sphinx/dev/ClientAPI.rst | 2 +- docs/src/site/sphinx/dev/DevEnv.rst | 1 - docs/src/site/sphinx/dev/Repository.rst | 2 -- docs/src/site/sphinx/user/CommandLineClient.rst | 4 ++-- docs/src/site/sphinx/user/Sqoop5MinutesDemo.rst | 4 ++-- docs/src/site/sphinx/user/connectors/Connector-Kafka.rst | 1 - 8 files changed, 5 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/sqoop/blob/3ed59d60/docs/src/site/sphinx/admin/Installation.rst ---------------------------------------------------------------------- diff --git a/docs/src/site/sphinx/admin/Installation.rst b/docs/src/site/sphinx/admin/Installation.rst index 9d56875..383c4ec 100644 --- a/docs/src/site/sphinx/admin/Installation.rst +++ b/docs/src/site/sphinx/admin/Installation.rst @@ -99,5 +99,3 @@ Client do not need extra installation and configuration steps. Just copy Sqoop d sqoop2-shell You can find more documentation to Sqoop client in `Command Line Client <CommandLineClient.html>`_ section. - - http://git-wip-us.apache.org/repos/asf/sqoop/blob/3ed59d60/docs/src/site/sphinx/admin/Tools.rst ---------------------------------------------------------------------- diff --git a/docs/src/site/sphinx/admin/Tools.rst b/docs/src/site/sphinx/admin/Tools.rst index fb0187a..3b1f5ac 100644 --- a/docs/src/site/sphinx/admin/Tools.rst +++ b/docs/src/site/sphinx/admin/Tools.rst @@ -121,9 +121,3 @@ Or an exception. Further details why the upgrade process has failed will be avai .. note:: If the repository dump was created without passwords (default), the connections will not contain a password and the jobs will fail to execute. In that case you'll need to manually update the connections and set the password. .. note:: RepositoryLoad tool will always generate new connections, jobs and submissions from the file. Even when an identical objects already exists in repository. - - - - - - http://git-wip-us.apache.org/repos/asf/sqoop/blob/3ed59d60/docs/src/site/sphinx/dev/ClientAPI.rst ---------------------------------------------------------------------- diff --git a/docs/src/site/sphinx/dev/ClientAPI.rst b/docs/src/site/sphinx/dev/ClientAPI.rst index 9626878..d69fabd 100644 --- a/docs/src/site/sphinx/dev/ClientAPI.rst +++ b/docs/src/site/sphinx/dev/ClientAPI.rst @@ -261,7 +261,7 @@ Starting a job requires a job id. On successful start, getStatus() method return } - //Check job status for a running job + //Check job status for a running job MSubmission submission = client.getJobStatus(jobId); if(submission.getStatus().isRunning() && submission.getProgress() != -1) { System.out.println("Progress : " + String.format("%.2f %%", submission.getProgress() * 100)); http://git-wip-us.apache.org/repos/asf/sqoop/blob/3ed59d60/docs/src/site/sphinx/dev/DevEnv.rst ---------------------------------------------------------------------- diff --git a/docs/src/site/sphinx/dev/DevEnv.rst b/docs/src/site/sphinx/dev/DevEnv.rst index 3b72e06..5cb0111 100644 --- a/docs/src/site/sphinx/dev/DevEnv.rst +++ b/docs/src/site/sphinx/dev/DevEnv.rst @@ -54,4 +54,3 @@ Sqoop 2 project has multiple modules where one module is depend on another modul Alternatively, for manually adding M2_REPO classpath variable as maven repository path in eclipse-> window-> Java ->Classpath Variables ->Click "New" ->In new dialog box, input Name as M2_REPO and Path as $HOME/.m2/repository ->click Ok. On successful execution of above maven commands, Then import the sqoop project modules into eclipse-> File -> Import ->General ->Existing Projects into Workspace-> Click Next-> Browse Sqoop 2 directory ($HOME/git/sqoop2) ->Click Ok ->Import dialog shows multiple projects (sqoop-client, sqoop-common, etc.) -> Select all modules -> click Finish. - http://git-wip-us.apache.org/repos/asf/sqoop/blob/3ed59d60/docs/src/site/sphinx/dev/Repository.rst ---------------------------------------------------------------------- diff --git a/docs/src/site/sphinx/dev/Repository.rst b/docs/src/site/sphinx/dev/Repository.rst index 55daf2e..4ad7331 100644 --- a/docs/src/site/sphinx/dev/Repository.rst +++ b/docs/src/site/sphinx/dev/Repository.rst @@ -331,5 +331,3 @@ N:M Relationship +----------------------------+--------------------------------+ | SQRS_VALUE: BIGINT | | +----------------------------+--------------------------------+ - - http://git-wip-us.apache.org/repos/asf/sqoop/blob/3ed59d60/docs/src/site/sphinx/user/CommandLineClient.rst ---------------------------------------------------------------------- diff --git a/docs/src/site/sphinx/user/CommandLineClient.rst b/docs/src/site/sphinx/user/CommandLineClient.rst index 8d52671..ee08de6 100644 --- a/docs/src/site/sphinx/user/CommandLineClient.rst +++ b/docs/src/site/sphinx/user/CommandLineClient.rst @@ -358,7 +358,7 @@ Create new job object. Example: :: - create job --from 1 --to 2 or create job --f 1 --t 2 + create job --from 1 --to 2 or create job --f 1 --t 2 Update Command -------------- @@ -530,4 +530,4 @@ Retrieve last status for given job. Example: :: - status job --jid 1 \ No newline at end of file + status job --jid 1 http://git-wip-us.apache.org/repos/asf/sqoop/blob/3ed59d60/docs/src/site/sphinx/user/Sqoop5MinutesDemo.rst ---------------------------------------------------------------------- diff --git a/docs/src/site/sphinx/user/Sqoop5MinutesDemo.rst b/docs/src/site/sphinx/user/Sqoop5MinutesDemo.rst index 19115a2..d45f32e 100644 --- a/docs/src/site/sphinx/user/Sqoop5MinutesDemo.rst +++ b/docs/src/site/sphinx/user/Sqoop5MinutesDemo.rst @@ -218,7 +218,7 @@ You can iteratively check your running job status with ``status job`` command: Lastly updated by: root External ID: job_1412137947693_0001 http://vbsqoop-1.ent.cloudera.com:8088/proxy/application_1412137947693_0001/ - 2014-11-04 20:09:16 PST: RUNNING - 0.00 % + 2014-11-04 20:09:16 PST: RUNNING - 0.00 % Alternatively you can start a sqoop job and observe job running status with the following command: @@ -239,4 +239,4 @@ Alternatively you can start a sqoop job and observe job running status with the And finally you can stop running the job at any time using ``stop job`` command: :: - sqoop:000> stop job -j 1 \ No newline at end of file + sqoop:000> stop job -j 1 http://git-wip-us.apache.org/repos/asf/sqoop/blob/3ed59d60/docs/src/site/sphinx/user/connectors/Connector-Kafka.rst ---------------------------------------------------------------------- diff --git a/docs/src/site/sphinx/user/connectors/Connector-Kafka.rst b/docs/src/site/sphinx/user/connectors/Connector-Kafka.rst index b6bca14..5d3f75a 100644 --- a/docs/src/site/sphinx/user/connectors/Connector-Kafka.rst +++ b/docs/src/site/sphinx/user/connectors/Connector-Kafka.rst @@ -61,4 +61,3 @@ Loader ------ During the *loading* phase, Kafka is written to directly from each loader. The order in which data is loaded into Kafka is not guaranteed. -
