You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by el...@apache.org on 2014/01/11 03:17:15 UTC

[1/3] git commit: ACCUMULO-1983 Lift init.d scripts out of modules into tarball

Updated Branches:
  refs/heads/1.6.0-SNAPSHOT 9f5637417 -> 3ab5c3ee2
  refs/heads/master af151d698 -> 08be60ebf


ACCUMULO-1983 Lift init.d scripts out of modules into tarball

With the init.d scripts being moved from the assemble module to the
server corresponding server module which the init.d script starts,
the other assemble/scripts/*.sh scripts reference non-existent files
in the tarball assembly.


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3ab5c3ee
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3ab5c3ee
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3ab5c3ee

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 3ab5c3ee2fa0d60480d27e027ce864dfcfbed10e
Parents: 9f56374
Author: Josh Elser <el...@apache.org>
Authored: Fri Jan 10 21:14:37 2014 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Fri Jan 10 21:14:37 2014 -0500

----------------------------------------------------------------------
 assemble/src/main/assemblies/component.xml | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/3ab5c3ee/assemble/src/main/assemblies/component.xml
----------------------------------------------------------------------
diff --git a/assemble/src/main/assemblies/component.xml b/assemble/src/main/assemblies/component.xml
index 3655a22..fa53d5e 100644
--- a/assemble/src/main/assemblies/component.xml
+++ b/assemble/src/main/assemblies/component.xml
@@ -217,6 +217,31 @@
       <directoryMode>0755</directoryMode>
       <fileMode>0755</fileMode>
     </fileSet>
+    <fileSet>
+      <directory>../server/gc/src/main/packaging/etc/init.d</directory>
+      <outputDirectory>scripts/init.d</outputDirectory>
+      <fileMode>0755</fileMode>
+    </fileSet>
+    <fileSet>
+      <directory>../server/master/src/main/packaging/etc/init.d</directory>
+      <outputDirectory>scripts/init.d</outputDirectory>
+      <fileMode>0755</fileMode>
+    </fileSet>
+    <fileSet>
+      <directory>../server/monitor/src/main/packaging/etc/init.d</directory>
+      <outputDirectory>scripts/init.d</outputDirectory>
+      <fileMode>0755</fileMode>
+    </fileSet>
+    <fileSet>
+      <directory>../server/tracer/src/main/packaging/etc/init.d</directory>
+      <outputDirectory>scripts/init.d</outputDirectory>
+      <fileMode>0755</fileMode>
+    </fileSet>
+    <fileSet>
+      <directory>../server/tserver/src/main/packaging/etc/init.d</directory>
+      <outputDirectory>scripts/init.d</outputDirectory>
+      <fileMode>0755</fileMode>
+    </fileSet>
   </fileSets>
   <files>
     <file>


[3/3] git commit: Merge branch '1.6.0-SNAPSHOT'

Posted by el...@apache.org.
Merge branch '1.6.0-SNAPSHOT'


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/08be60eb
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/08be60eb
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/08be60eb

Branch: refs/heads/master
Commit: 08be60ebf8fe5be1d11827ecd8ebea6d2acea4df
Parents: af151d6 3ab5c3e
Author: Josh Elser <el...@apache.org>
Authored: Fri Jan 10 21:17:01 2014 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Fri Jan 10 21:17:01 2014 -0500

----------------------------------------------------------------------
 assemble/src/main/assemblies/component.xml | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
----------------------------------------------------------------------



[2/3] git commit: ACCUMULO-1983 Lift init.d scripts out of modules into tarball

Posted by el...@apache.org.
ACCUMULO-1983 Lift init.d scripts out of modules into tarball

With the init.d scripts being moved from the assemble module to the
server corresponding server module which the init.d script starts,
the other assemble/scripts/*.sh scripts reference non-existent files
in the tarball assembly.


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3ab5c3ee
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3ab5c3ee
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3ab5c3ee

Branch: refs/heads/master
Commit: 3ab5c3ee2fa0d60480d27e027ce864dfcfbed10e
Parents: 9f56374
Author: Josh Elser <el...@apache.org>
Authored: Fri Jan 10 21:14:37 2014 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Fri Jan 10 21:14:37 2014 -0500

----------------------------------------------------------------------
 assemble/src/main/assemblies/component.xml | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/3ab5c3ee/assemble/src/main/assemblies/component.xml
----------------------------------------------------------------------
diff --git a/assemble/src/main/assemblies/component.xml b/assemble/src/main/assemblies/component.xml
index 3655a22..fa53d5e 100644
--- a/assemble/src/main/assemblies/component.xml
+++ b/assemble/src/main/assemblies/component.xml
@@ -217,6 +217,31 @@
       <directoryMode>0755</directoryMode>
       <fileMode>0755</fileMode>
     </fileSet>
+    <fileSet>
+      <directory>../server/gc/src/main/packaging/etc/init.d</directory>
+      <outputDirectory>scripts/init.d</outputDirectory>
+      <fileMode>0755</fileMode>
+    </fileSet>
+    <fileSet>
+      <directory>../server/master/src/main/packaging/etc/init.d</directory>
+      <outputDirectory>scripts/init.d</outputDirectory>
+      <fileMode>0755</fileMode>
+    </fileSet>
+    <fileSet>
+      <directory>../server/monitor/src/main/packaging/etc/init.d</directory>
+      <outputDirectory>scripts/init.d</outputDirectory>
+      <fileMode>0755</fileMode>
+    </fileSet>
+    <fileSet>
+      <directory>../server/tracer/src/main/packaging/etc/init.d</directory>
+      <outputDirectory>scripts/init.d</outputDirectory>
+      <fileMode>0755</fileMode>
+    </fileSet>
+    <fileSet>
+      <directory>../server/tserver/src/main/packaging/etc/init.d</directory>
+      <outputDirectory>scripts/init.d</outputDirectory>
+      <fileMode>0755</fileMode>
+    </fileSet>
   </fileSets>
   <files>
     <file>