From owner-svn-soc-all@freebsd.org  Fri Jun 10 12:35:49 2016
Return-Path: <owner-svn-soc-all@freebsd.org>
Delivered-To: svn-soc-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id EBFEDAEE8F6
 for <svn-soc-all@mailman.ysv.freebsd.org>;
 Fri, 10 Jun 2016 12:35:49 +0000 (UTC)
 (envelope-from litong@FreeBSD.org)
Received: from socsvn.freebsd.org (socsvn.freebsd.org
 [IPv6:2001:1900:2254:206a::50:2])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id DF8EA1E2C
 for <svn-soc-all@FreeBSD.org>; Fri, 10 Jun 2016 12:35:49 +0000 (UTC)
 (envelope-from litong@FreeBSD.org)
Received: from socsvn.freebsd.org ([127.0.1.124])
 by socsvn.freebsd.org (8.15.2/8.15.2) with ESMTP id u5ACZnkU031398
 for <svn-soc-all@FreeBSD.org>; Fri, 10 Jun 2016 12:35:49 GMT
 (envelope-from litong@FreeBSD.org)
Received: (from www@localhost)
 by socsvn.freebsd.org (8.15.2/8.15.2/Submit) id u5ACZmHJ030943
 for svn-soc-all@FreeBSD.org; Fri, 10 Jun 2016 12:35:48 GMT
 (envelope-from litong@FreeBSD.org)
Date: Fri, 10 Jun 2016 12:35:48 GMT
Message-Id: <201606101235.u5ACZmHJ030943@socsvn.freebsd.org>
X-Authentication-Warning: socsvn.freebsd.org: www set sender to
 litong@FreeBSD.org using -f
From: litong@FreeBSD.org
To: svn-soc-all@FreeBSD.org
Subject: socsvn commit: r305036 - in soc2016/litong/vagrant-bhyve/trunk: . bin
 lib/vagrant-bhyve spec/vagrant
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
 <svn-soc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all/>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 10 Jun 2016 12:35:50 -0000

Author: litong
Date: Fri Jun 10 12:35:48 2016
New Revision: 305036
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=305036

Log:
  remove bin

Deleted:
  soc2016/litong/vagrant-bhyve/trunk/bin/console
  soc2016/litong/vagrant-bhyve/trunk/bin/setup
  soc2016/litong/vagrant-bhyve/trunk/spec/vagrant/bhyve_spec.rb
Modified:
  soc2016/litong/vagrant-bhyve/trunk/.gitignore
  soc2016/litong/vagrant-bhyve/trunk/lib/vagrant-bhyve/version.rb

Modified: soc2016/litong/vagrant-bhyve/trunk/.gitignore
==============================================================================
--- soc2016/litong/vagrant-bhyve/trunk/.gitignore	Fri Jun 10 12:35:09 2016	(r305035)
+++ soc2016/litong/vagrant-bhyve/trunk/.gitignore	Fri Jun 10 12:35:48 2016	(r305036)
@@ -7,7 +7,11 @@
 /pkg/
 /spec/reports/
 /tmp/
+<<<<<<< f0976cd4b81347c0d687988ff6463d3113e547d2
 <<<<<<< 8569ecf8bd116d9e214f6907f29993bd8e03d40d
 /svn-commit.tmp
 =======
 >>>>>>> Initial commit
+=======
+/svn-commit.tmp
+>>>>>>> remove bin

Modified: soc2016/litong/vagrant-bhyve/trunk/lib/vagrant-bhyve/version.rb
==============================================================================
--- soc2016/litong/vagrant-bhyve/trunk/lib/vagrant-bhyve/version.rb	Fri Jun 10 12:35:09 2016	(r305035)
+++ soc2016/litong/vagrant-bhyve/trunk/lib/vagrant-bhyve/version.rb	Fri Jun 10 12:35:48 2016	(r305036)
@@ -1,8 +1,12 @@
+<<<<<<< f0976cd4b81347c0d687988ff6463d3113e547d2
 <<<<<<< 8569ecf8bd116d9e214f6907f29993bd8e03d40d
 module VagrantPlugins
 =======
 module Vagrant
 >>>>>>> Initial commit
+=======
+module VagrantPlugins
+>>>>>>> remove bin
   module Bhyve
     VERSION = "0.1.0"
   end