summaryrefslogtreecommitdiff
path: root/solaris
diff options
context:
space:
mode:
authorAvneesh Sachdev <avneesh@opensourcerouting.org>2012-04-09 00:25:15 -0700
committerAvneesh Sachdev <avneesh@opensourcerouting.org>2012-04-09 00:25:15 -0700
commit3cf6c2b4e43f44a977d218c96c26250654ae333e (patch)
treee017cde2015fbf3ef6c250327428d7c6152aa8f7 /solaris
parent01d7ff0a2166a422c56bd26f04fc22832a9e690b (diff)
parente96b312150d8e376c1ef463793d1929eca3618d5 (diff)
Merge branch 'quagga' into google-bgp-multipath
Conflicts: bgpd/bgp_route.c
Diffstat (limited to 'solaris')
-rw-r--r--solaris/.cvsignore14
-rw-r--r--solaris/Makefile.am1
-rwxr-xr-xsolaris/quagga.init.in2
3 files changed, 0 insertions, 17 deletions
diff --git a/solaris/.cvsignore b/solaris/.cvsignore
deleted file mode 100644
index 810874ca..00000000
--- a/solaris/.cvsignore
+++ /dev/null
@@ -1,14 +0,0 @@
-Makefile
-Makefile.in
-?.manifest
-*.xml
-pkginfo.*.full
-pkginfo.tmpl
-prototype.daemons
-prototype.dev
-prototype.doc
-prototype.libs
-prototype.smf
-quagga.init
-*.pkg
-*.pkg.gz
diff --git a/solaris/Makefile.am b/solaris/Makefile.am
index ecaf9b9b..dcee240c 100644
--- a/solaris/Makefile.am
+++ b/solaris/Makefile.am
@@ -1,5 +1,4 @@
# Solaris packages automake file
-# $Id$
# XXX This file uses GNU make extensions.
diff --git a/solaris/quagga.init.in b/solaris/quagga.init.in
index 8457e990..00426241 100755
--- a/solaris/quagga.init.in
+++ b/solaris/quagga.init.in
@@ -20,8 +20,6 @@
# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
# 02111-1307, USA.
#
-# $Id$
-#
# Starts/stops the given daemon
SMFINCLUDE=/lib/svc/share/smf_include.sh