You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by su...@apache.org on 2015/11/02 16:33:27 UTC

[1/2] incubator-trafodion git commit: [[ TRAFODION 1563 ]] Fix INSTALL_LOG name

Repository: incubator-trafodion
Updated Branches:
  refs/heads/master 038c55464 -> 55d6526ff


[[ TRAFODION 1563 ]] Fix INSTALL_LOG name


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

Branch: refs/heads/master
Commit: 2e1e1a79e9b79ec69776fe81ff7c1b4483e245c3
Parents: 2fffe34
Author: Amanda Moran <am...@apache.com>
Authored: Fri Oct 30 21:09:57 2015 +0000
Committer: Amanda Moran <am...@apache.com>
Committed: Fri Oct 30 21:09:57 2015 +0000

----------------------------------------------------------------------
 install/installer/trafodion_install | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/2e1e1a79/install/installer/trafodion_install
----------------------------------------------------------------------
diff --git a/install/installer/trafodion_install b/install/installer/trafodion_install
index 9ff2c8d..4357b8b 100755
--- a/install/installer/trafodion_install
+++ b/install/installer/trafodion_install
@@ -195,8 +195,8 @@ echo
 export timestamp=$(date +%F-%H-%M-%S)
 export TRAF_LOGDIR="/var/log/trafodion"
 export INSTALL_LOG="$TRAF_LOGDIR/trafodion_install_$timestamp.log"
+export INSTALL_LOG_CP="$INSTALL_LOG"
 export SCANNER_LOG="$TRAF_LOGDIR/trafodion_scanner_$timestamp.log"
-#export TRAF_WORKDIR="$( cd "$( dirname "$0" )" && pwd )/.."
 export TRAF_WORKDIR="/usr/lib/trafodion"
 export LOCAL_WORKDIR="$( cd "$( dirname "$0" )" && pwd )"
 export TRAF_CONFIG="/etc/trafodion/trafodion_config"
@@ -329,7 +329,7 @@ fi
 
 sudo chmod 777 $TRAF_CONFIG
 sed -i '/INSTALL_LOG\=/d' $TRAF_CONFIG
-echo "export INSTALL_LOG=\"$INSTALL_LOG\"" >> $TRAF_CONFIG
+echo "export INSTALL_LOG=\"$INSTALL_LOG_CP\"" >> $TRAF_CONFIG
 sudo chmod 777 $TRAF_CONFIG
 source $TRAF_CONFIG
 


[2/2] incubator-trafodion git commit: Merge remote branch 'origin/pr/154/head' into mrg_75

Posted by su...@apache.org.
Merge remote branch 'origin/pr/154/head' into mrg_75


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/55d6526f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/55d6526f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/55d6526f

Branch: refs/heads/master
Commit: 55d6526ffb7db1f7afb8f3c1e309f89669cc1b31
Parents: 038c554 2e1e1a7
Author: Suresh Subbiah <su...@apache.org>
Authored: Mon Nov 2 15:33:04 2015 +0000
Committer: Suresh Subbiah <su...@apache.org>
Committed: Mon Nov 2 15:33:04 2015 +0000

----------------------------------------------------------------------
 install/installer/trafodion_install | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------