Updated Branches: refs/heads/master 07059ec04 -> 29fa1b3d8
BIGTOP-969. a few files belong to more than one package Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/ce01e18f Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/ce01e18f Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/ce01e18f Branch: refs/heads/master Commit: ce01e18f6f77896c9626927189274eea0c8076b1 Parents: 07059ec Author: Roman Shaposhnik <[email protected]> Authored: Mon May 6 19:46:39 2013 -0700 Committer: Roman Shaposhnik <[email protected]> Committed: Mon May 6 19:46:39 2013 -0700 ---------------------------------------------------------------------- bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec | 4 ++-- .../package/src/main/resources/apt/sqoop.xml | 8 ++++---- .../package/src/main/resources/yum/sqoop.xml | 8 ++++---- .../package/src/main/resources/zypper/sqoop.xml | 8 ++++---- 4 files changed, 14 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/ce01e18f/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec b/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec index 4bdf038..0768665 100644 --- a/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec +++ b/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec @@ -582,7 +582,6 @@ fi %files hdfs %defattr(-,root,root) %config(noreplace) %{etc_hadoop}/conf.empty/hdfs-site.xml -%config(noreplace) /etc/default/hadoop-fuse %config(noreplace) /etc/security/limits.d/hdfs.conf %{lib_hdfs} %{lib_hadoop}/libexec/hdfs-config.sh @@ -626,7 +625,8 @@ fi %{lib_hadoop}/*.jar %{lib_hadoop}/lib %{lib_hadoop}/sbin -%{lib_hadoop}/bin +%{lib_hadoop}/bin/hadoop +%{lib_hadoop}/bin/rcc %{lib_hadoop}/etc %{lib_hadoop}/libexec/hadoop-config.sh %{lib_hadoop}/libexec/hadoop-layout.sh http://git-wip-us.apache.org/repos/asf/bigtop/blob/ce01e18f/bigtop-tests/test-artifacts/package/src/main/resources/apt/sqoop.xml ---------------------------------------------------------------------- diff --git a/bigtop-tests/test-artifacts/package/src/main/resources/apt/sqoop.xml b/bigtop-tests/test-artifacts/package/src/main/resources/apt/sqoop.xml index 8f18d2e..830f4fb 100644 --- a/bigtop-tests/test-artifacts/package/src/main/resources/apt/sqoop.xml +++ b/bigtop-tests/test-artifacts/package/src/main/resources/apt/sqoop.xml @@ -4,7 +4,7 @@ <file name='/usr' owners='-1' perm='drwxr-xr-x' user='root' group='root' /> <file name='/usr/bin' owners='-1' perm='drwxr-xr-x' user='root' group='root' /> <file name='/usr/bin/sqoop-import' owners='1' perm='-rwxr-xr-x' user='root' group='root' /> - <file name='/usr/bin/sqoop' owners='1' perm='-rwxr-xr-x' user='root' group='root' /> + <file name='/usr/bin/sqoop-server' owners='1' perm='-rwxr-xr-x' user='root' group='root' /> <file name='/usr/bin/sqoop-version' owners='1' perm='-rwxr-xr-x' user='root' group='root' /> <file name='/usr/bin/sqoop-list-tables' owners='1' perm='-rwxr-xr-x' user='root' group='root' /> <file name='/usr/bin/sqoop-export' owners='1' perm='-rwxr-xr-x' user='root' group='root' /> @@ -18,9 +18,9 @@ <file name='/usr/bin/sqoop-codegen' owners='1' perm='-rwxr-xr-x' user='root' group='root' /> <file name='/usr/bin/sqoop-eval' owners='1' perm='-rwxr-xr-x' user='root' group='root' /> <file name='/usr/lib' owners='-1' perm='drwxr-xr-x' user='root' group='root' /> - <file name='/usr/lib/sqoop' owners='1' perm='drwxr-xr-x' user='root' group='root' /> + <file name='/usr/lib/sqoop' owners='-1' perm='drwxr-xr-x' user='root' group='root' /> <file name='/usr/lib/sqoop/sqoop-test-1.4.1-incubating.jar' owners='1' perm='-rw-r--r--' user='root' group='root' /> - <file name='/usr/lib/sqoop/bin' owners='1' perm='drwxr-xr-x' user='root' group='root' /> + <file name='/usr/lib/sqoop/bin' owners='-1' perm='drwxr-xr-x' user='root' group='root' /> <file name='/usr/lib/sqoop/bin/start-metastore.sh' owners='1' perm='-rwxr-xr-x' user='root' group='root' /> <file name='/usr/lib/sqoop/bin/sqoop-import' owners='1' perm='-rwxr-xr-x' user='root' group='root' /> <file name='/usr/lib/sqoop/bin/sqoop' owners='1' perm='-rwxr-xr-x' user='root' group='root' /> @@ -208,4 +208,4 @@ <config name='/etc/sqoop/conf.dist/.gitignore' owners='1' perm='-rw-r--r--' user='root' group='root' /> <file name='/usr/lib/sqoop/conf' owners='1' perm='lrwxrwxrwx' user='root' group='root' target='/etc/sqoop/conf' /> </content> -</sqoop> \ No newline at end of file +</sqoop> http://git-wip-us.apache.org/repos/asf/bigtop/blob/ce01e18f/bigtop-tests/test-artifacts/package/src/main/resources/yum/sqoop.xml ---------------------------------------------------------------------- diff --git a/bigtop-tests/test-artifacts/package/src/main/resources/yum/sqoop.xml b/bigtop-tests/test-artifacts/package/src/main/resources/yum/sqoop.xml index 44bcf1e..4710291 100644 --- a/bigtop-tests/test-artifacts/package/src/main/resources/yum/sqoop.xml +++ b/bigtop-tests/test-artifacts/package/src/main/resources/yum/sqoop.xml @@ -4,7 +4,7 @@ <config name='/etc/sqoop/conf.dist/.gitignore' owners='1' perm='-rwxr-xr-x' user='root' group='root' /> <config name='/etc/sqoop/conf.dist/sqoop-site-template.xml' owners='1' perm='-rwxr-xr-x' user='root' group='root' /> <config name='/etc/sqoop/conf.dist/sqoop-site.xml' owners='1' perm='-rwxr-xr-x' user='root' group='root' /> - <file name='/usr/bin/sqoop' owners='1' perm='-rwxr-xr-x' user='root' group='root' /> + <file name='/usr/bin/sqoop-server' owners='1' perm='-rwxr-xr-x' user='root' group='root' /> <file name='/usr/bin/sqoop-codegen' owners='1' perm='-rwxr-xr-x' user='root' group='root' /> <file name='/usr/bin/sqoop-create-hive-table' owners='1' perm='-rwxr-xr-x' user='root' group='root' /> <file name='/usr/bin/sqoop-eval' owners='1' perm='-rwxr-xr-x' user='root' group='root' /> @@ -18,8 +18,8 @@ <file name='/usr/bin/sqoop-merge' owners='1' perm='-rwxr-xr-x' user='root' group='root' /> <file name='/usr/bin/sqoop-metastore' owners='1' perm='-rwxr-xr-x' user='root' group='root' /> <file name='/usr/bin/sqoop-version' owners='1' perm='-rwxr-xr-x' user='root' group='root' /> - <file name='/usr/lib/sqoop' owners='1' perm='drwxr-xr-x' user='root' group='root' /> - <file name='/usr/lib/sqoop/bin' owners='1' perm='drwxr-xr-x' user='root' group='root' /> + <file name='/usr/lib/sqoop' owners='-1' perm='drwxr-xr-x' user='root' group='root' /> + <file name='/usr/lib/sqoop/bin' owners='-1' perm='drwxr-xr-x' user='root' group='root' /> <file name='/usr/lib/sqoop/bin/configure-sqoop' owners='1' perm='-rwxr-xr-x' user='root' group='root' /> <file name='/usr/lib/sqoop/bin/sqoop' owners='1' perm='-rwxr-xr-x' user='root' group='root' /> <file name='/usr/lib/sqoop/bin/sqoop-codegen' owners='1' perm='-rwxr-xr-x' user='root' group='root' /> @@ -195,4 +195,4 @@ <doc name='/usr/share/man/man1/sqoop-version.1.gz' owners='1' perm='-rw-r--r--' user='root' group='root' /> <doc name='/usr/share/man/man1/sqoop.1.gz' owners='1' perm='-rw-r--r--' user='root' group='root' /> </content> -</sqoop> \ No newline at end of file +</sqoop> http://git-wip-us.apache.org/repos/asf/bigtop/blob/ce01e18f/bigtop-tests/test-artifacts/package/src/main/resources/zypper/sqoop.xml ---------------------------------------------------------------------- diff --git a/bigtop-tests/test-artifacts/package/src/main/resources/zypper/sqoop.xml b/bigtop-tests/test-artifacts/package/src/main/resources/zypper/sqoop.xml index 19e2335..7fe1618 100644 --- a/bigtop-tests/test-artifacts/package/src/main/resources/zypper/sqoop.xml +++ b/bigtop-tests/test-artifacts/package/src/main/resources/zypper/sqoop.xml @@ -4,7 +4,7 @@ <config name='/etc/sqoop/conf.dist/.gitignore' owners='1' perm='-rwxr-xr-x' user='root' group='root' /> <config name='/etc/sqoop/conf.dist/sqoop-site-template.xml' owners='1' perm='-rwxr-xr-x' user='root' group='root' /> <config name='/etc/sqoop/conf.dist/sqoop-site.xml' owners='1' perm='-rwxr-xr-x' user='root' group='root' /> - <file name='/usr/bin/sqoop' owners='1' perm='-rwxr-xr-x' user='root' group='root' /> + <file name='/usr/bin/sqoop-server' owners='1' perm='-rwxr-xr-x' user='root' group='root' /> <file name='/usr/bin/sqoop-codegen' owners='1' perm='-rwxr-xr-x' user='root' group='root' /> <file name='/usr/bin/sqoop-create-hive-table' owners='1' perm='-rwxr-xr-x' user='root' group='root' /> <file name='/usr/bin/sqoop-eval' owners='1' perm='-rwxr-xr-x' user='root' group='root' /> @@ -18,8 +18,8 @@ <file name='/usr/bin/sqoop-merge' owners='1' perm='-rwxr-xr-x' user='root' group='root' /> <file name='/usr/bin/sqoop-metastore' owners='1' perm='-rwxr-xr-x' user='root' group='root' /> <file name='/usr/bin/sqoop-version' owners='1' perm='-rwxr-xr-x' user='root' group='root' /> - <file name='/usr/lib/sqoop' owners='1' perm='drwxr-xr-x' user='root' group='root' /> - <file name='/usr/lib/sqoop/bin' owners='1' perm='drwxr-xr-x' user='root' group='root' /> + <file name='/usr/lib/sqoop' owners='-1' perm='drwxr-xr-x' user='root' group='root' /> + <file name='/usr/lib/sqoop/bin' owners='-1' perm='drwxr-xr-x' user='root' group='root' /> <file name='/usr/lib/sqoop/bin/configure-sqoop' owners='1' perm='-rwxr-xr-x' user='root' group='root' /> <file name='/usr/lib/sqoop/bin/sqoop' owners='1' perm='-rwxr-xr-x' user='root' group='root' /> <file name='/usr/lib/sqoop/bin/sqoop-codegen' owners='1' perm='-rwxr-xr-x' user='root' group='root' /> @@ -196,4 +196,4 @@ <doc name='/usr/share/man/man1/sqoop-version.1.gz' owners='1' perm='-rw-r--r--' user='root' group='root' /> <doc name='/usr/share/man/man1/sqoop.1.gz' owners='1' perm='-rw-r--r--' user='root' group='root' /> </content> -</sqoop> \ No newline at end of file +</sqoop>
