Repository: incubator-htrace
Updated Branches:
refs/heads/master 884bc02a0 -> 94fb1b81a
HTRACE-71 Address Billie Renaldi comments on RC6 (.gitignore clash and 'pkg'
still in src tarball)
Conflicts:
LICENSE.txt
Project: http://git-wip-us.apache.org/repos/asf/incubator-htrace/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-htrace/commit/94fb1b81
Tree: http://git-wip-us.apache.org/repos/asf/incubator-htrace/tree/94fb1b81
Diff: http://git-wip-us.apache.org/repos/asf/incubator-htrace/diff/94fb1b81
Branch: refs/heads/master
Commit: 94fb1b81a2491d7ebe52eab89eb242bc780002d5
Parents: 884bc02
Author: stack <[email protected]>
Authored: Tue Jan 13 14:12:54 2015 -0800
Committer: stack <[email protected]>
Committed: Tue Jan 13 14:19:29 2015 -0800
----------------------------------------------------------------------
LICENSE.txt | 4 ++++
htrace-core/src/go/gobuild.sh | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/94fb1b81/LICENSE.txt
----------------------------------------------------------------------
diff --git a/LICENSE.txt b/LICENSE.txt
index 9667e15..a2ba0e6 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -222,3 +222,7 @@ https://github.com/twbs/bootstrap/blob/master/LICENSE
Gorilla mux gorilla/mux implements a request router and dispatcher is BSD
licensed
( https://github.com/gorilla/mux/blob/master/LICENSE
+
+godep, a build dependency is Copyright © 2013 Keith Rarick
+and portions Copyright (c) 2012 The Go Authors. Its a BSD
+license: https://github.com/tools/godep/blob/master/License
http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/94fb1b81/htrace-core/src/go/gobuild.sh
----------------------------------------------------------------------
diff --git a/htrace-core/src/go/gobuild.sh b/htrace-core/src/go/gobuild.sh
index 7c0e52f..4aad01b 100755
--- a/htrace-core/src/go/gobuild.sh
+++ b/htrace-core/src/go/gobuild.sh
@@ -79,7 +79,7 @@ fi
case $ACTION in
clean)
- rm -rf -- "${GOBIN}" pkg
+ rm -rf -- "${GOBIN}" ${SCRIPT_DIR}/pkg
find "${SCRIPT_DIR}/src/org/apache/htrace/resource" ! -name 'catalog.go' \
-type f -exec rm -f {} +
;;
