You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@omid.apache.org by fp...@apache.org on 2016/06/03 21:27:44 UTC
[17/23] incubator-omid git commit: Merge pull request #107 from
yahoo/omid-31
Merge pull request #107 from yahoo/omid-31
[OMID-31] Add missing license header
Project: http://git-wip-us.apache.org/repos/asf/incubator-omid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-omid/commit/1f989f89
Tree: http://git-wip-us.apache.org/repos/asf/incubator-omid/tree/1f989f89
Diff: http://git-wip-us.apache.org/repos/asf/incubator-omid/diff/1f989f89
Branch: refs/heads/master
Commit: 1f989f899b34d03d53e4f50d9599cff586528d84
Parents: fda5666 14c8f70
Author: Francisco P�rez-Sorrosal <fp...@gmail.com>
Authored: Tue May 24 10:58:34 2016 -0700
Committer: Francisco P�rez-Sorrosal <fp...@gmail.com>
Committed: Tue May 24 10:58:34 2016 -0700
----------------------------------------------------------------------
benchmarks/bin/benchmarks.sh | 18 ++++++++++++++++++
benchmarks/bin/omid-env.sh | 18 ++++++++++++++++++
doc/site/resources/css/site.css | 17 +++++++++++++++++
examples/run.sh | 18 ++++++++++++++++++
pom.xml | 5 ++---
tso-server/bin/omid.sh | 18 ++++++++++++++++++
tso-server/conf/omid-env.sh | 18 ++++++++++++++++++
7 files changed, 109 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/1f989f89/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/1f989f89/tso-server/bin/omid.sh
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/1f989f89/tso-server/conf/omid-env.sh
----------------------------------------------------------------------
diff --cc tso-server/conf/omid-env.sh
index 2d836bd,2d01a1d..578382c
--- a/tso-server/conf/omid-env.sh
+++ b/tso-server/conf/omid-env.sh
@@@ -1,9 -1,20 +1,27 @@@
+ #
+ # Licensed to the Apache Software Foundation (ASF) under one
+ # or more contributor license agreements. See the NOTICE file
+ # distributed with this work for additional information
+ # regarding copyright ownership. The ASF licenses this file
+ # to you under the Apache License, Version 2.0 (the
+ # "License"); you may not use this file except in compliance
+ # with the License. You may obtain a copy of the License at
+ #
+ # http://www.apache.org/licenses/LICENSE-2.0
+ #
+ # Unless required by applicable law or agreed to in writing, software
+ # distributed under the License is distributed on an "AS IS" BASIS,
+ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ # See the License for the specific language governing permissions and
+ # limitations under the License.
+ #
+
# Set the flags to pass to the jvm when running omid
# export JVM_FLAGS=-Xmx8096m
+# ---------------------------------------------------------------------------------------------------------------------
+# Check if HADOOP_CONF_DIR and HBASE_CONF_DIR are set
+# ---------------------------------------------------------------------------------------------------------------------
+
+if [ -z ${HADOOP_CONF_DIR+x} ]; then echo "WARNING: HADOOP_CONF_DIR is unset"; else echo "HADOOP_CONF_DIR is set to '$HADOOP_CONF_DIR'"; fi
+if [ -z ${HBASE_CONF_DIR+x} ]; then echo "WARNING: HBASE_CONF_DIR is unset"; else echo "HBASE_CONF_DIR is set to '$HBASE_CONF_DIR'"; fi
+