gmane.os.freenas.scm

SF.net SVN: freenas:[13467]projects/pluginjail/nanobsd/os-base

2013-03-29T01:07:56

Revision: 13467
          http://freenas.svn.sourceforge.net/freenas/?rev=13467&view=rev
Author:   jhixson
Date:     2013-03-29 01:07:55 +0000 (Fri, 29 Mar 2013)
Log Message:
-----------
Remove testdisk from this branch since it can't build

Modified Paths:
--------------
    projects/pluginjail/nanobsd/os-base

Modified: projects/pluginjail/nanobsd/os-base
===================================================================
--- projects/pluginjail/nanobsd/os-base2013-03-27 23:59:35 UTC (rev 13466)
+++ projects/pluginjail/nanobsd/os-base2013-03-29 01:07:55 UTC (rev 13467)
< at >< at > -308,7 +308,7 < at >< at >
 add_port devel/py-greenlet
 add_port net/py-eventlet
 add_port graphics/jpeg
-add_port sysutils/testdisk OPTIONS_FILE_SET+=NTFS OPTIONS_FILE_SET+=NTFS3G OPTIONS_FILE_SET+=ICONV
+#add_port sysutils/testdisk OPTIONS_FILE_SET+=NTFS OPTIONS_FILE_SET+=NTFS3G OPTIONS_FILE_SET+=ICONV
 
 if [ "${DEBUG}" = 1 ]; then
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source devel

SF.net SVN: freenas:[13466] projects/pluginjail

2013-03-27T23:59:36

Revision: 13466
          http://freenas.svn.sourceforge.net/freenas/?rev=13466&view=rev
Author:   jhixson
Date:     2013-03-27 23:59:35 +0000 (Wed, 27 Mar 2013)
Log Message:
-----------
Bring all changes to trunk into pluginjail branch.

Modified Paths:
--------------
    projects/pluginjail/.gitignore
    projects/pluginjail/README
    projects/pluginjail/build/create_iso.sh
    projects/pluginjail/gui/account/urls.py
    projects/pluginjail/gui/freeadmin/api/utils.py
    projects/pluginjail/gui/freeadmin/static/lib/js/freeadmin.js
    projects/pluginjail/gui/freeadmin/utils.py
    projects/pluginjail/gui/freeadmin/views.py
    projects/pluginjail/gui/jails/urls.py
    projects/pluginjail/gui/middleware/notifier.py
    projects/pluginjail/gui/network/urls.py
    projects/pluginjail/gui/plugins/urls.py
    projects/pluginjail/gui/reporting/urls.py
    projects/pluginjail/gui/services/forms.py
    projects/pluginjail/gui/services/models.py
    projects/pluginjail/gui/services/urls.py
    projects/pluginjail/

SF.net SVN: freenas:[13465] projects/pluginjail

2013-03-27T05:41:07

Revision: 13465
          http://freenas.svn.sourceforge.net/freenas/?rev=13465&view=rev
Author:   jhixson
Date:     2013-03-27 05:41:04 +0000 (Wed, 27 Mar 2013)
Log Message:
-----------
manual merge of trunk stuff to get build to work.

Modified Paths:
--------------
    projects/pluginjail/build/nano_env
    projects/pluginjail/gui/settings.py

Modified: projects/pluginjail/build/nano_env
===================================================================
--- projects/pluginjail/build/nano_env2013-03-26 22:22:03 UTC (rev 13464)
+++ projects/pluginjail/build/nano_env2013-03-27 05:41:04 UTC (rev 13465)
< at >< at > -21,8 +21,8 < at >< at >
 # explicitly in the script.
 : ${FREENAS_ARCH=$(uname -p)}
 if ! [ "${FREENAS_ARCH}" == "amd64" -o "${FREENAS_ARCH}" == "i386" ] ; then
-    echo "Possible values for FREENAS_ARCH are amd64 or i386"
-    exit
+echo "Possible values for FREENAS_ARCH are amd64 or i386"
+exit
 fi
 NANO_ARCH=$FREENAS_ARCH
 
< at >< at > -86,7 +86,7 < at >< at >
 else
 svn=`$git_cmd log | fgrep 'git-svn-id:' | head -1 | \

SF.net SVN: freenas:[13464] projects/pluginjail

2013-03-26T22:22:04

Revision: 13464
          http://freenas.svn.sourceforge.net/freenas/?rev=13464&view=rev
Author:   jhixson
Date:     2013-03-26 22:22:03 +0000 (Tue, 26 Mar 2013)
Log Message:
-----------
Bring trunk changes into pluginjail branch (including updating to FreeBSD
9.x)

Modified Paths:
--------------
    projects/pluginjail/README
    projects/pluginjail/build/build_bug.sh
    projects/pluginjail/build/do_build.sh
    projects/pluginjail/gui/reporting/rrd.py
    projects/pluginjail/gui/services/models.py
    projects/pluginjail/gui/sharing/forms.py
    projects/pluginjail/gui/templates/freeadmin/generic_model_add.html
    projects/pluginjail/gui/templates/freeadmin/generic_model_edit.html
    projects/pluginjail/nanobsd/Files/etc/rc.d/ix-nfsd
    projects/pluginjail/nanobsd/common
    projects/pluginjail/nanobsd/os-base

Added Paths:
-----------
    projects/pluginjail/gui/services/migrations/0068_auto__del_field_nfs_nfs_srv_async.py

Property Changed:
----------------
    projects/pluginjail/

Index: projects/p

SF.net SVN: freenas:[13463] trunk/nanobsd/os-base

2013-03-22T13:55:53

Revision: 13463
          http://freenas.svn.sourceforge.net/freenas/?rev=13463&view=rev
Author:   zippybr
Date:     2013-03-22 13:55:52 +0000 (Fri, 22 Mar 2013)
Log Message:
-----------
Add back sysutils/testdisk with options ng

While I'm here remove x11/libICE and x11/libSM which I believe
are no longer needed since cairo new options

Modified Paths:
--------------
    trunk/nanobsd/os-base

Modified: trunk/nanobsd/os-base
===================================================================
--- trunk/nanobsd/os-base2013-03-21 23:45:11 UTC (rev 13462)
+++ trunk/nanobsd/os-base2013-03-22 13:55:52 UTC (rev 13463)
< at >< at > -284,9 +284,7 < at >< at >
 add_port sysutils/graid5
 add_port devel/libevent
 add_port sysutils/tmux
-add_port x11/libICE
-add_port x11/libSM
-add_port net/netatalk WITH_PAM=y WITHOUT_APPLETALK=y WITHOUT_X11=y
+add_port net/netatalk WITH_PAM=y WITHOUT_APPLETALK=y
 add_port dns/libidn
 add_port ftp/wget
 add_port benchmarks/iozone
< at >< at > -310,8 +308,7 < at >< at >
 add_port devel/py-greenlet
 add_port net/py-eventlet

SF.net SVN: freenas:[13462]trunk/gui/reporting/rrd.py

2013-03-21T23:45:12

Revision: 13462
          http://freenas.svn.sourceforge.net/freenas/?rev=13462&view=rev
Author:   zippybr
Date:     2013-03-21 23:45:11 +0000 (Thu, 21 Mar 2013)
Log Message:
-----------
Fix interfaces graphs

Reported by: Richard Kojedzinszky (via email)

Modified Paths:
--------------
    trunk/gui/reporting/rrd.py

Modified: trunk/gui/reporting/rrd.py
===================================================================
--- trunk/gui/reporting/rrd.py2013-03-21 21:43:11 UTC (rev 13461)
+++ trunk/gui/reporting/rrd.py2013-03-21 23:45:11 UTC (rev 13462)
< at >< at > -24,6 +24,7 < at >< at >
 # POSSIBILITY OF SUCH DAMAGE.
 #
 #####################################################################
+import glob
 import logging
 import os
 import re
< at >< at > -70,6 +71,7 < at >< at >
             self.unit = str(unit)
         if step is not None:
             self.step = int(step)
+        self._base_path = base_path
         self.base_path = os.path.join(base_path, self.plugin)
 
     def __repr__(self):
< at >< at > -194,20 +196,17 < at >< at >
 
     def get_identifi

SF.net SVN: freenas:[13461] trunk/nanobsd/os-base

2013-03-21T21:43:11

Revision: 13461
          http://freenas.svn.sourceforge.net/freenas/?rev=13461&view=rev
Author:   zippybr
Date:     2013-03-21 21:43:11 +0000 (Thu, 21 Mar 2013)
Log Message:
-----------
Remove ZMQ support for ipython

Modified Paths:
--------------
    trunk/nanobsd/os-base

Modified: trunk/nanobsd/os-base
===================================================================
--- trunk/nanobsd/os-base2013-03-21 19:35:24 UTC (rev 13460)
+++ trunk/nanobsd/os-base2013-03-21 21:43:11 UTC (rev 13461)
< at >< at > -322,7 +322,7 < at >< at >
 add_port devel/subversion
 add_port editors/vim-lite
 add_port misc/py-pexpect
-add_port devel/ipython OPTIONS_FILE_UNSET+=X11
+add_port devel/ipython OPTIONS_FILE_UNSET+=X11 OPTIONS_FILE_UNSET+=ZMQ
 add_port devel/p5-Term-ReadKey
 add_port devel/p5-subversion
 add_port mail/p5-Net-SMTP-SSL

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


---------------------------------------------------------------------------

SF.net SVN: freenas:[13460] trunk/build/do_build.sh

2013-03-21T19:35:25

Revision: 13460
          http://freenas.svn.sourceforge.net/freenas/?rev=13460&view=rev
Author:   zippybr
Date:     2013-03-21 19:35:24 +0000 (Thu, 21 Mar 2013)
Log Message:
-----------
Use --depth 1 in git pull as well

Modified Paths:
--------------
    trunk/build/do_build.sh

Modified: trunk/build/do_build.sh
===================================================================
--- trunk/build/do_build.sh2013-03-21 19:29:57 UTC (rev 13459)
+++ trunk/build/do_build.sh2013-03-21 19:35:24 UTC (rev 13460)
< at >< at > -326,7 +326,7 < at >< at >
 
 git checkout ${GIT_BRANCH}
 fi
-git pull
+git pull --depth 1
 cd ..
 else
 spl="$-";set -x
< at >< at > -399,7 +399,7 < at >< at >
 cd "$AVATAR_ROOT/FreeBSD"
 if [ -d ports/.git ] ; then
 cd ports
-git pull
+git pull --depth 1
 cd ..
 else
 : ${GIT_PORTS_BRANCH=master}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


------------------------------------------------------------------------------
Everyo

SF.net SVN: freenas:[13459] trunk/nanobsd/os-base

2013-03-21T19:29:57

Revision: 13459
          http://freenas.svn.sourceforge.net/freenas/?rev=13459&view=rev
Author:   zippybr
Date:     2013-03-21 19:29:57 +0000 (Thu, 21 Mar 2013)
Log Message:
-----------
Lets try removing those packages by removing some options from cairo

Modified Paths:
--------------
    trunk/nanobsd/os-base

Modified: trunk/nanobsd/os-base
===================================================================
--- trunk/nanobsd/os-base2013-03-21 18:08:06 UTC (rev 13458)
+++ trunk/nanobsd/os-base2013-03-21 19:29:57 UTC (rev 13459)
< at >< at > -239,12 +239,7 < at >< at >
 add_port devel/libstatgrab
 add_port devel/libltdl
 add_port print/freetype2
-add_port x11/kbproto
 add_port x11/xproto
-add_port x11/libXdmcp
-add_port x11/libXau
-add_port x11/libxcb
-add_port x11/libX11
 add_port x11-fonts/fontconfig
 add_port x11-fonts/libfontenc
 add_port x11-fonts/mkfontscale
< at >< at > -256,13 +251,8 < at >< at >
 add_port x11-fonts/font-util
 add_port x11-fonts/encodings
 add_port x11-fonts/xorg-fonts-truetype
-add_port x11/xcb-util
-

SF.net SVN: freenas:[13458] trunk/nanobsd/os-base

2013-03-21T18:08:06

Revision: 13458
          http://freenas.svn.sourceforge.net/freenas/?rev=13458&view=rev
Author:   zippybr
Date:     2013-03-21 18:08:06 +0000 (Thu, 21 Mar 2013)
Log Message:
-----------
databases/rrdtool has been recently converted as well

Modified Paths:
--------------
    trunk/nanobsd/os-base

Modified: trunk/nanobsd/os-base
===================================================================
--- trunk/nanobsd/os-base2013-03-21 17:03:00 UTC (rev 13457)
+++ trunk/nanobsd/os-base2013-03-21 18:08:06 UTC (rev 13458)
< at >< at > -264,8 +264,9 < at >< at >
 add_port x11/pixman
 add_port graphics/cairo OPTIONS_FILE_UNSET+=X11
 add_port x11-toolkits/pango OPTIONS_FILE_UNSET+=X11
-add_port databases/rrdtoolWITHOUT_X11=y WITHOUT_PERL_MODULE=y \
-WITH_PYTHON_MODULE=y
+add_port databases/rrdtool OPTIONS_FILE_SET+=PERL_MODULE \
+OPTIONS_FILE_SET+=PYTHON_MODULE \
+OPTIONS_FILE_SET+=JSON
 add_port net/liboping
 add_port net-mgmt/collectd5 OPTIONS_FILE_UNSET+=BIND OPTIONS_FILE_UNSET+=SNMP \
    OPTIONS_FILE_SET+

SF.net SVN: freenas:[13457] trunk/nanobsd/os-base

2013-03-21T17:03:01

Revision: 13457
          http://freenas.svn.sourceforge.net/freenas/?rev=13457&view=rev
Author:   zippybr
Date:     2013-03-21 17:03:00 +0000 (Thu, 21 Mar 2013)
Log Message:
-----------
Use Options NG for a few more ports

Modified Paths:
--------------
    trunk/nanobsd/os-base

Modified: trunk/nanobsd/os-base
===================================================================
--- trunk/nanobsd/os-base2013-03-20 16:10:19 UTC (rev 13456)
+++ trunk/nanobsd/os-base2013-03-21 17:03:00 UTC (rev 13457)
< at >< at > -162,7 +162,7 < at >< at >
 add_port converters/iconv
 add_port devel/gettext
 add_port devel/pkgconf
-add_port devel/libpthread-stubs WITHOUT_X11=y
+add_port devel/libpthread-stubs
 add_port devel/cdialog
 add_port dns/inadyn
 add_port devel/pcre
< at >< at > -262,14 +262,13 < at >< at >
 add_port x11/xcb-proto
 add_port x11/xcb-util-renderutil
 add_port x11/pixman
-add_port graphics/cairo WITHOUT_X11=y
-add_port x11-toolkits/pango WITHOUT_X11=y
+add_port graphics/cairo OPTIONS_FILE_UNSET+=X11
+add_port x11-toolkits/pango OPTIONS_

SF.net SVN: freenas:[13456] trunk/nanobsd/os-base

2013-03-20T16:10:21

Revision: 13456
          http://freenas.svn.sourceforge.net/freenas/?rev=13456&view=rev
Author:   zippybr
Date:     2013-03-20 16:10:19 +0000 (Wed, 20 Mar 2013)
Log Message:
-----------
devel/py-rose is now a dependency for www/py-django-tastypie

Modified Paths:
--------------
    trunk/nanobsd/os-base

Modified: trunk/nanobsd/os-base
===================================================================
--- trunk/nanobsd/os-base2013-03-20 13:54:28 UTC (rev 13455)
+++ trunk/nanobsd/os-base2013-03-20 16:10:19 UTC (rev 13456)
< at >< at > -309,6 +309,7 < at >< at >
 add_port devel/py-mimeparse
 add_port devel/py-six
 add_port devel/py-dateutil
+add_port devel/py-rose
 add_port www/py-django-tastypie
 add_port devel/py-daemon
 add_port devel/py-polib

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


------------------------------------------------------------------------------
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynam

SF.net SVN: freenas:[13455]trunk/gui/sharing/forms.py

2013-03-20T13:54:29

Revision: 13455
          http://freenas.svn.sourceforge.net/freenas/?rev=13455&view=rev
Author:   zippybr
Date:     2013-03-20 13:54:28 +0000 (Wed, 20 Mar 2013)
Log Message:
-----------
Do now allow creation of path-less NFS shares

ticket: #2072

Modified Paths:
--------------
    trunk/gui/sharing/forms.py

Modified: trunk/gui/sharing/forms.py
===================================================================
--- trunk/gui/sharing/forms.py2013-03-20 13:53:38 UTC (rev 13454)
+++ trunk/gui/sharing/forms.py2013-03-20 13:54:28 UTC (rev 13455)
< at >< at > -24,6 +24,7 < at >< at >
 # POSSIBILITY OF SUCH DAMAGE.
 #
 #####################################################################
+import logging
 import os
 import re
 
< at >< at > -39,7 +40,9 < at >< at >
     IPNetwork, AddressValueError, NetmaskValueError
 )
 
+log = logging.getLogger('sharing.forms')
 
+
 class CIFS_ShareForm(ModelForm):
 
     def __init__(self, *args, **kwargs):
< at >< at > -302,6 +305,23 < at >< at >
 
         return valid
 
+    def is_valid(self, formsets):
+        paths = formsets.g

SF.net SVN: freenas:[13454]trunk/gui/templates/freeadmin

2013-03-20T13:54:09

Revision: 13454
          http://freenas.svn.sourceforge.net/freenas/?rev=13454&view=rev
Author:   zippybr
Date:     2013-03-20 13:53:38 +0000 (Wed, 20 Mar 2013)
Log Message:
-----------
Add hidden input to show non field errors for formsets

Modified Paths:
--------------
    trunk/gui/templates/freeadmin/generic_model_add.html
    trunk/gui/templates/freeadmin/generic_model_edit.html

Modified: trunk/gui/templates/freeadmin/generic_model_add.html
===================================================================
--- trunk/gui/templates/freeadmin/generic_model_add.html2013-03-18 22:21:25 UTC (rev 13453)
+++ trunk/gui/templates/freeadmin/generic_model_add.html2013-03-20 13:53:38 UTC (rev 13454)
< at >< at > -21,6 +21,7 < at >< at >
                 <tr>
                     <td colspan="2">
                     {{ formset.verbose_name }}
+    <input data-dojo-type="dijit.form.TextBox" type="hidden" name="{{ name }}-__all__" />
                     </td>
                 </tr>
                 {% for form in formset %}

Mod

SF.net SVN: freenas:[13453] trunk

2013-03-18T22:21:26

Revision: 13453
          http://freenas.svn.sourceforge.net/freenas/?rev=13453&view=rev
Author:   zippybr
Date:     2013-03-18 22:21:25 +0000 (Mon, 18 Mar 2013)
Log Message:
-----------
Update build_bug.sh

Modified Paths:
--------------
    trunk/README
    trunk/build/build_bug.sh

Modified: trunk/README
===================================================================
--- trunk/README2013-03-16 23:17:12 UTC (rev 13452)
+++ trunk/README2013-03-18 22:21:25 UTC (rev 13453)
< at >< at > -11,7 +11,7 < at >< at >
 - amd64 or i386 for i386 builds; an amd64 for amd64 builds.
 - You will need the following ports/packages when compiling anything
   FreeNAS-related:
-  - devel/git or devel/subversion
+  - devel/git
   - lang/python26 or lang/python27
 
 - You need the following additional ports/packages to build the FreeNAS base

Modified: trunk/build/build_bug.sh
===================================================================
--- trunk/build/build_bug.sh2013-03-16 23:17:12 UTC (rev 13452)
+++ trunk/build/build_bug.sh2013-03

SF.net SVN: freenas:[13452] tags/8.3.1-RELEASE/

2013-03-16T23:17:13

Revision: 13452
          http://freenas.svn.sourceforge.net/freenas/?rev=13452&view=rev
Author:   jpaetzel
Date:     2013-03-16 23:17:12 +0000 (Sat, 16 Mar 2013)
Log Message:
-----------
The real tag for the real 8.3.1-RELEASE

Added Paths:
-----------
    tags/8.3.1-RELEASE/

Index: tags/8.3.1-RELEASE
===================================================================
--- branches/8.32013-03-16 23:15:30 UTC (rev 13451)
+++ tags/8.3.1-RELEASE2013-03-16 23:17:12 UTC (rev 13452)

Property changes on: tags/8.3.1-RELEASE
___________________________________________________________________
Added: svn:mergeinfo
## -0,0 +1,12 ##
+/branches/8.0.1:7333,7346
+/branches/8.1:6033-6383
+/branches/8.2-nup:10658,10663,10668,10671,10673,10677-10678,10680-10681,10683,10685,10688-10689
+/branches/8.2.0-new-upgrade-path:10601
+/branches/bs:11368-11369,11377
+/branches/build_system:11262,11293-11294
+/branches/dev-8.3:10721
+/branches/dojo17:8468-8495
+/branches/feedback:6189-6347
+/experimental/ix-8.2:5657-5682
+/tags/8.0.3-

SF.net SVN: freenas:[13451]branches/8.3/ReleaseNotes

2013-03-16T23:15:31

Revision: 13451
          http://freenas.svn.sourceforge.net/freenas/?rev=13451&view=rev
Author:   jpaetzel
Date:     2013-03-16 23:15:30 +0000 (Sat, 16 Mar 2013)
Log Message:
-----------
Update releasenotes to reflect last minute fixes.

Modified Paths:
--------------
    branches/8.3/ReleaseNotes

Modified: branches/8.3/ReleaseNotes
===================================================================
--- branches/8.3/ReleaseNotes2013-03-16 23:11:33 UTC (rev 13450)
+++ branches/8.3/ReleaseNotes2013-03-16 23:15:30 UTC (rev 13451)
< at >< at > -161,6 +161,8 < at >< at >
 7. Do not unlabel the disk when deleting device extents.  This could cause
    problems when moving the disk to a different system.
 
+8. Add the ability to delete the password from an AFP share.
+
 Changes since 8.3.1-BETA3:
 
 Enhancements

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


------------------------------------------------------------------------------
Everyone hates slo

SF.net SVN: freenas:[13450] tags/8.3.1-RELEASE/

2013-03-16T23:11:34

Revision: 13450
          http://freenas.svn.sourceforge.net/freenas/?rev=13450&view=rev
Author:   jpaetzel
Date:     2013-03-16 23:11:33 +0000 (Sat, 16 Mar 2013)
Log Message:
-----------
Per our custom, retag.

Removed Paths:
-------------
    tags/8.3.1-RELEASE/

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


------------------------------------------------------------------------------
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://p.sf.net/sfu/appdyn_d2d_mar

SF.net SVN: freenas:[13449] trunk/nanobsd/common

2013-03-15T23:43:46

Revision: 13449
          http://freenas.svn.sourceforge.net/freenas/?rev=13449&view=rev
Author:   zippybr
Date:     2013-03-15 23:43:43 +0000 (Fri, 15 Mar 2013)
Log Message:
-----------
Use set +e here as a workaround for the shift in last interation failing

This would cause a infinite loop in the build

Modified Paths:
--------------
    trunk/nanobsd/common

Modified: trunk/nanobsd/common
===================================================================
--- trunk/nanobsd/common2013-03-15 14:38:25 UTC (rev 13448)
+++ trunk/nanobsd/common2013-03-15 23:43:43 UTC (rev 13449)
< at >< at > -314,7 +314,7 < at >< at >
 do_fetch_background () {
 
 local fetch_list=$1
-set -- $NANO_FETCH_PORTS_BG
+set +e -- $NANO_FETCH_PORTS_BG
 i=1
 num_steps=$#
 while [ $i -le $num_steps ]
< at >< at > -326,6 +326,7 < at >< at >
         : $(( i += 1 ))
 done
 rm ${fetch_list}
+set -e
 }
 
 fetch_background ()

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


--------------------

SF.net SVN: freenas:[13448] trunk/nanobsd/os-base

2013-03-15T14:38:28

Revision: 13448
          http://freenas.svn.sourceforge.net/freenas/?rev=13448&view=rev
Author:   zippybr
Date:     2013-03-15 14:38:25 +0000 (Fri, 15 Mar 2013)
Log Message:
-----------
Remove DEBUG apps that are not being used and there are no plans to use

Modified Paths:
--------------
    trunk/nanobsd/os-base

Modified: trunk/nanobsd/os-base
===================================================================
--- trunk/nanobsd/os-base2013-03-15 13:37:32 UTC (rev 13447)
+++ trunk/nanobsd/os-base2013-03-15 14:38:25 UTC (rev 13448)
< at >< at > -312,6 +312,7 < at >< at >
 add_port www/py-django-tastypie
 add_port devel/py-daemon
 add_port devel/py-polib
+add_port devel/py-ujson
 add_port devel/py-simplejson
 add_port sysutils/bsdstats
 add_port www/wgetpaste
< at >< at > -321,30 +322,15 < at >< at >
 #FIXME: failing to fetch
 #add_port sysutils/testdisk WITH_NTFS3G=y
 
-# NOTE: in reality these aren't DEBUG apps, but this ensures that they aren't
-# counted against the release image's size because they aren't used in
-# production yet.
 if [ "

SF.net SVN: freenas:[13447] trunk

2013-03-15T13:37:33

Revision: 13447
          http://freenas.svn.sourceforge.net/freenas/?rev=13447&view=rev
Author:   zippybr
Date:     2013-03-15 13:37:32 +0000 (Fri, 15 Mar 2013)
Log Message:
-----------
Remove the nfs async option, it doesn't do anything on FreeBSD 9.

Modified Paths:
--------------
    trunk/gui/services/models.py
    trunk/nanobsd/Files/etc/rc.d/ix-nfsd

Added Paths:
-----------
    trunk/gui/services/migrations/0068_auto__del_field_nfs_nfs_srv_async.py

Added: trunk/gui/services/migrations/0068_auto__del_field_nfs_nfs_srv_async.py
===================================================================
--- trunk/gui/services/migrations/0068_auto__del_field_nfs_nfs_srv_async.py                        (rev 0)
+++ trunk/gui/services/migrations/0068_auto__del_field_nfs_nfs_srv_async.py2013-03-15 13:37:32 UTC (rev 13447)
< at >< at > -0,0 +1,328 < at >< at >
+# encoding: utf-8
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+class Migration(SchemaMigration):
+
+    def