You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by co...@apache.org on 2014/06/18 23:21:59 UTC

[1/2] git commit: BIGTOP-1340. Hbase build has to use hadoop-two.version sys. prop

Repository: bigtop
Updated Branches:
  refs/heads/master 3f2184278 -> 2c74797aa


BIGTOP-1340. Hbase build has to use hadoop-two.version sys. prop


Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/5df838d0
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/5df838d0
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/5df838d0

Branch: refs/heads/master
Commit: 5df838d0627cd64216ecb6f36e62853cfeabe0a4
Parents: 1b0862f
Author: Konstantin Boudnik <co...@apache.org>
Authored: Wed Jun 18 14:13:46 2014 -0700
Committer: Konstantin Boudnik <co...@apache.org>
Committed: Wed Jun 18 14:13:46 2014 -0700

----------------------------------------------------------------------
 bigtop-packages/src/common/hbase/do-component-build | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/bigtop/blob/5df838d0/bigtop-packages/src/common/hbase/do-component-build
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/hbase/do-component-build b/bigtop-packages/src/common/hbase/do-component-build
index a4c552f..a8f7d07 100644
--- a/bigtop-packages/src/common/hbase/do-component-build
+++ b/bigtop-packages/src/common/hbase/do-component-build
@@ -19,11 +19,11 @@ set -ex
 . `dirname $0`/bigtop.bom
 
 mvn -DskipTests -Dslf4j.version=1.6.1         \
-    -Dhadoop.version=$HADOOP_VERSION          \
+    -Dhadoop-two.version=$HADOOP_VERSION      \
     -Dzookeeper.version=$ZOOKEEPER_VERSION    \
     clean install "$@" &&     \
 mvn -DskipTests -Dslf4j.version=1.6.1         \
-    -Dhadoop.version=$HADOOP_VERSION          \
+    -Dhadoop-two.version=$HADOOP_VERSION      \
     -Dzookeeper.version=$ZOOKEEPER_VERSION    \
     install site assembly:single "$@"
 rm -rf build


[2/2] git commit: Merge remote-tracking branch 'public/master' into pub-master

Posted by co...@apache.org.
Merge remote-tracking branch 'public/master' into pub-master


Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/2c74797a
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/2c74797a
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/2c74797a

Branch: refs/heads/master
Commit: 2c74797aa7ee1804f9c4181174a9772dbafb4e84
Parents: 5df838d 3f21842
Author: Konstantin Boudnik <co...@apache.org>
Authored: Wed Jun 18 14:21:46 2014 -0700
Committer: Konstantin Boudnik <co...@apache.org>
Committed: Wed Jun 18 14:21:46 2014 -0700

----------------------------------------------------------------------
 bigtop-packages/src/common/flume/install_flume.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------