You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@htrace.apache.org by st...@apache.org on 2015/01/10 01:15:18 UTC
incubator-htrace git commit: Revert "HTRACE-65 Add a basic
BUILDING.txt" Revert. Overcommitted. Added HTRACE-64 by mistake.
Repository: incubator-htrace
Updated Branches:
refs/heads/3.1 d01121b4a -> e1c6b295f
Revert "HTRACE-65 Add a basic BUILDING.txt"
Revert. Overcommitted. Added HTRACE-64 by mistake.
This reverts commit d01121b4a4b3656e539fc9b70c77aa007b9a6efa.
Project: http://git-wip-us.apache.org/repos/asf/incubator-htrace/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-htrace/commit/e1c6b295
Tree: http://git-wip-us.apache.org/repos/asf/incubator-htrace/tree/e1c6b295
Diff: http://git-wip-us.apache.org/repos/asf/incubator-htrace/diff/e1c6b295
Branch: refs/heads/3.1
Commit: e1c6b295fd42114ddbb4e9dc39a88e3ba7923e2a
Parents: d01121b
Author: stack <st...@duboce.net>
Authored: Fri Jan 9 16:12:58 2015 -0800
Committer: stack <st...@duboce.net>
Committed: Fri Jan 9 16:14:51 2015 -0800
----------------------------------------------------------------------
htrace-core/pom.xml | 7 +++----
src/main/assembly/src.xml | 2 --
2 files changed, 3 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/e1c6b295/htrace-core/pom.xml
----------------------------------------------------------------------
diff --git a/htrace-core/pom.xml b/htrace-core/pom.xml
index bb9a30f..7c04789 100644
--- a/htrace-core/pom.xml
+++ b/htrace-core/pom.xml
@@ -114,10 +114,9 @@ language governing permissions and limitations under the License. -->
<arg value="-c"/>
<arg value="./gobuild.sh clean"/>
</exec>
- <exec executable="git" failonerror="true" dir="${basedir}/src/go">
- <arg value="clean"/>
- <arg value="-ffqdx"/>
- <arg value="."/>
+ <exec executable="bash" failonerror="true" dir="${basedir}/src/go">
+ <arg value="-c"/>
+ <arg value="rm -f ./bin/*"/>
</exec>
</tasks>
</configuration>
http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/e1c6b295/src/main/assembly/src.xml
----------------------------------------------------------------------
diff --git a/src/main/assembly/src.xml b/src/main/assembly/src.xml
index 605e808..fecbf5d 100644
--- a/src/main/assembly/src.xml
+++ b/src/main/assembly/src.xml
@@ -43,7 +43,6 @@
<exclude>.gitignore</exclude>
<exclude>.settings/</exclude>
<exclude>**/src/go/bin/**</exclude>
- <exclude>**/src/go/pkg/**</exclude>
</excludes>
</fileSet>
</fileSets>
@@ -81,7 +80,6 @@
<include>NOTICE.txt</include>
<include>CHANGES.txt</include>
<include>DISCLAIMER.txt</include>
- <include>BUILDING.txt</include>
<include>README.md</include>
</includes>
<fileMode>0644</fileMode>