Merge branch '1.6'
Conflicts:
core/src/main/scripts/generate-thrift.sh
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/984c6b86
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/984c6b86
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/984c6b86
Branch: refs/heads/master
Commit: 984c6b86c5b8e546248ec10e47d98ddf0f91f115
Parents: 59333e3 87fbb4b
Author: John Vines <vi...@apache.org>
Authored: Sat Oct 25 14:59:54 2014 -0400
Committer: John Vines <vi...@apache.org>
Committed: Sat Oct 25 14:59:54 2014 -0400
----------------------------------------------------------------------
core/src/main/scripts/generate-thrift.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/984c6b86/core/src/main/scripts/generate-thrift.sh
----------------------------------------------------------------------
diff --cc core/src/main/scripts/generate-thrift.sh
index 9fe743d,ee5bb8e..8c60cf3
--- a/core/src/main/scripts/generate-thrift.sh
+++ b/core/src/main/scripts/generate-thrift.sh
@@@ -26,13 -26,13 +26,13 @@@
# INCLUDED_MODULES should be an array that includes other Maven modules
with src/main/thrift directories
# Use INCLUDED_MODULES=(-) in calling scripts that require no other modules
#
========================================================================================================================
- [[ -z $REQUIRED_THRIFT_VERSION ]] && REQUIRED_THRIFT_VERSION='0.9'
-[ -z $REQUIRED_THRIFT_VERSION ] && REQUIRED_THRIFT_VERSION='0.9.1'
-[ -z $INCLUDED_MODULES ] && INCLUDED_MODULES=(../trace)
-[ -z $BASE_OUTPUT_PACKAGE ] &&
BASE_OUTPUT_PACKAGE='org.apache.accumulo.core'
-[ -z $PACKAGES_TO_GENERATE ] && PACKAGES_TO_GENERATE=(gc master
tabletserver security client.impl data)
-[ -z $BUILD_DIR ] && BUILD_DIR='target'
-[ -z $LANGUAGES_TO_GENERATE ] && LANGUAGES_TO_GENERATE=(java)
-[ -z $FINAL_DIR ] && FINAL_DIR='src/main'
++[[ -z $REQUIRED_THRIFT_VERSION ]] && REQUIRED_THRIFT_VERSION='0.9.1'
+[[ -z $INCLUDED_MODULES ]] && INCLUDED_MODULES=(../trace)
+[[ -z $BASE_OUTPUT_PACKAGE ]] &&
BASE_OUTPUT_PACKAGE='org.apache.accumulo.core'
+[[ -z $PACKAGES_TO_GENERATE ]] && PACKAGES_TO_GENERATE=(gc master
tabletserver security client.impl data replication)
+[[ -z $BUILD_DIR ]] && BUILD_DIR='target'
+[[ -z $LANGUAGES_TO_GENERATE ]] && LANGUAGES_TO_GENERATE=(java)
+[[ -z $FINAL_DIR ]] && FINAL_DIR='src/main'
#
========================================================================================================================
fail() {
