You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by jp...@apache.org on 2013/03/28 19:20:45 UTC
[1/2] git commit: Remove config.nice during distclean.
Updated Branches:
refs/heads/master 4e53792f2 -> e1e83f874
Remove config.nice during distclean.
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/5774cc43
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/5774cc43
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/5774cc43
Branch: refs/heads/master
Commit: 5774cc439294a99dc8f1661da401fa93ed1c8514
Parents: 4e53792
Author: James Peach <jp...@apache.org>
Authored: Thu Mar 28 11:19:30 2013 -0700
Committer: James Peach <jp...@apache.org>
Committed: Thu Mar 28 11:19:30 2013 -0700
----------------------------------------------------------------------
Makefile.am | 29 ++++++++++++++++-------------
1 files changed, 16 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/5774cc43/Makefile.am
----------------------------------------------------------------------
diff --git a/Makefile.am b/Makefile.am
index 939f822..46cf284 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -44,6 +44,9 @@ test: check
installcheck-local:
$(DESTDIR)$(bindir)/traffic_server -R 1
+distclean-local:
+ -rm -f config.nice
+
doxygen:
@cd doc && $(MAKE) $(AM_MAKEFLAGS) $@
@@ -73,17 +76,17 @@ install-data-hook:
help:
@echo 'all default target for building the package' && \
- echo 'check run the test suite, if any' && \
- echo 'clean remove whatever make created' && \
- echo 'distclean remove whatever configure created' && \
- echo 'dist DEPRECATED: recreate source package' && \
- echo 'examples make examples' && \
- echo 'asf-dist recreate source package' && \
- echo 'asf-dist-sign recreate source package, with checksums and signature' && \
- echo 'distcheck verify dist by performing VPATH build and then distclean' && \
- echo 'doxygen generate doxygen docs in doc/html dir' && \
- echo 'help display this list of make targets' && \
- echo 'install install by copying the built files to system-wide dirs' && \
- echo 'install-strip same as install but then strips debugging symbols' && \
- echo 'install-examples install examples by copying the built files to system-wide dirs'
+ echo 'check run the test suite, if any' && \
+ echo 'clean remove whatever make created' && \
+ echo 'distclean remove whatever configure created' && \
+ echo 'dist DEPRECATED: recreate source package' && \
+ echo 'examples make examples' && \
+ echo 'asf-dist recreate source package' && \
+ echo 'asf-dist-sign recreate source package, with checksums and signature' && \
+ echo 'distcheck verify dist by performing VPATH build and then distclean' && \
+ echo 'doxygen generate doxygen docs in doc/html dir' && \
+ echo 'help display this list of make targets' && \
+ echo 'install install by copying the built files to system-wide dirs' && \
+ echo 'install-strip same as install but then strips debugging symbols' && \
+ echo 'install-examples install examples by copying the built files to system-wide dirs'
[2/2] git commit: Fix centos vagrant box
Posted by jp...@apache.org.
Fix centos vagrant box
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/e1e83f87
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/e1e83f87
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/e1e83f87
Branch: refs/heads/master
Commit: e1e83f874fcfed6f40eecdc65eaf3ea11b00a36c
Parents: 5774cc4
Author: James Peach <jp...@apache.org>
Authored: Thu Mar 28 11:20:05 2013 -0700
Committer: James Peach <jp...@apache.org>
Committed: Thu Mar 28 11:20:05 2013 -0700
----------------------------------------------------------------------
Vagrantfile | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e1e83f87/Vagrantfile
----------------------------------------------------------------------
diff --git a/Vagrantfile b/Vagrantfile
index ab57463..8c7c755 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -55,7 +55,7 @@ Vagrant.configure("2") do |config|
config.vm.define :centos63 do |config|
config.vm.box = "centos63"
- config.vm.network :hostonly, "192.168.100.8"
+ config.vm.network :private_network, ip: "192.168.100.8"
config.vm.box_url = "https://dl.dropbox.com/u/7225008/Vagrant/CentOS-6.3-x86_64-minimal.box"
config.vm.provision :puppet do |puppet|
puppet.manifests_path = "contrib/manifests"