accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [10/10] accumulo git commit: Merge branch '1.7'
Date Thu, 11 Jun 2015 00:57:43 GMT
Merge branch '1.7'

Conflicts:
	assemble/build.sh


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

Branch: refs/heads/master
Commit: a5e4ae849b5d8ce9e1c18c357d0e957a9f3eb276
Parents: 07e7a80 2481323
Author: Christopher Tubbs <ctubbsii@apache.org>
Authored: Wed Jun 10 20:57:08 2015 -0400
Committer: Christopher Tubbs <ctubbsii@apache.org>
Committed: Wed Jun 10 20:57:08 2015 -0400

----------------------------------------------------------------------
 assemble/build.sh | 85 +++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 84 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/a5e4ae84/assemble/build.sh
----------------------------------------------------------------------
diff --cc assemble/build.sh
index 8c339f9,ef183b8..a009d77
--- a/assemble/build.sh
+++ b/assemble/build.sh
@@@ -52,8 -138,10 +133,10 @@@ elif [[ $1 = '--test' ]]; the
    cacheGPG
    # build a tag, but with tests
    run mvn clean install \
 -   -P apache-release,thrift,assemble,docs
 +   -P apache-release,thrift,assemble,docs,accumulo-release
+ elif [[ $1 = '--create-email' ]]; then
+   createEmail
  else
-   fail "Missing one of: --create-release-candidate, --test"
 -  fail "Missing one of: --create-release-candidate, --test, --seal-jars, --create-email"
++  fail "Missing one of: --create-release-candidate, --test, --create-email"
  fi
  


Mime
View raw message