Repository: incubator-trafodion Updated Branches: refs/heads/master ff2b62c01 -> b7ecf18f9
Fixing merge error Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/ddd5fa0c Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/ddd5fa0c Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/ddd5fa0c Branch: refs/heads/master Commit: ddd5fa0c8b60699a0957cd1cfa40129a0bee90a9 Parents: a93953d Author: Amanda Moran <[email protected]> Authored: Mon Apr 4 17:17:22 2016 +0000 Committer: Amanda Moran <[email protected]> Committed: Mon Apr 4 17:17:22 2016 +0000 ---------------------------------------------------------------------- install/installer/rest_installer | 1 - 1 file changed, 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/ddd5fa0c/install/installer/rest_installer ---------------------------------------------------------------------- diff --git a/install/installer/rest_installer b/install/installer/rest_installer index 2907c2a..5ecf6f5 100755 --- a/install/installer/rest_installer +++ b/install/installer/rest_installer @@ -76,7 +76,6 @@ while [[ $# -gt 0 ]]; do shift done -source echo "***INFO: Start of REST Server install" source $TRAF_CONFIG
