dev | 20 Apr 12:07 2014

[freenas/freenas] fec915c: Hello 9.2.1.4.1.

branch: 9.2.1-BRANCH
Repository: freenas/freenas
Pushed by: git
Pushed to: branch 9.2.1-BRANCH
commit fec915c1140cd5a7284bac1938d212c13a96f1c7
Author: Jordan Hubbard <jkh@...>
Date:   Sun Apr 20 03:07:06 2014 -0700

    Hello 9.2.1.4.1.
---
 Makefile     |  2 +-
 ReleaseNotes | 11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index c74eaad..e581e63 100644
--- a/Makefile
+++ b/Makefile
 <at>  <at>  -3,7 +3,7  <at>  <at> 
 .endif

 NANO_LABEL?=FreeNAS
-VERSION?=9.2.1.4-RELEASE
+VERSION?=9.2.1.4.1-RELEASE
 BUILD_TIMESTAMP!=date '+%Y%m%d'
 COMPANY?="iXsystems"

diff --git a/ReleaseNotes b/ReleaseNotes
index 7e5d9ad..5b7cbaf 100644
--- a/ReleaseNotes
(Continue reading)

dev | 19 Apr 23:02 2014

[freenas/freenas] 38e411d: Fix typo in help text.

branch: 9.2.1-BRANCH
Repository: freenas/freenas
Pushed by: git
Pushed to: branch 9.2.1-BRANCH
commit 38e411de2d60989c3bdf18a1c37da0e11bc81b82
Author: Josh Paetzel <josh@...>
Date:   Sat Apr 19 14:01:29 2014 -0700

    Fix typo in help text.

    Ticket: #4840
---
 gui/storage/forms.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gui/storage/forms.py b/gui/storage/forms.py
index a5a7807..a4f260d 100644
--- a/gui/storage/forms.py
+++ b/gui/storage/forms.py
 <at>  <at>  -1589,7 +1589,7  <at>  <at>  class ZVol_CreateForm(Form):
     zvol_sparse = forms.BooleanField(
         label=_('Sparse volume'),
         help_text=_(
-            'Creates a sparse volume with no reservation, also kown '
+            'Creates a sparse volume with no reservation, also known '
             'as "thin provisioning". A "sparse volume" is a volume where the '
             'reservation is less than the volume size. Consequently, writes '
             'to a sparse volume can fail with ENOSPC when the pool is low on '
dev | 19 Apr 23:02 2014

[freenas/freenas] a0adc15: Fix typo in help text.

branch: master
Repository: freenas/freenas
Pushed by: git
Pushed to: branch master
commit a0adc151452c885055eabdff59f18ab6e1fd69c2
Author: Josh Paetzel <josh@...>
Date:   Sat Apr 19 14:01:29 2014 -0700

    Fix typo in help text.

    Ticket: #4840
---
 gui/storage/forms.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gui/storage/forms.py b/gui/storage/forms.py
index e82f0bf..db90b9b 100644
--- a/gui/storage/forms.py
+++ b/gui/storage/forms.py
 <at>  <at>  -1589,7 +1589,7  <at>  <at>  class ZVol_CreateForm(Form):
     zvol_sparse = forms.BooleanField(
         label=_('Sparse volume'),
         help_text=_(
-            'Creates a sparse volume with no reservation, also kown '
+            'Creates a sparse volume with no reservation, also known '
             'as "thin provisioning". A "sparse volume" is a volume where the '
             'reservation is less than the volume size. Consequently, writes '
             'to a sparse volume can fail with ENOSPC when the pool is low on '
dev | 19 Apr 21:58 2014

[freenas/freenas] cb1d343: I know python, I really do.

branch: 9.2.1-BRANCH
Repository: freenas/freenas
Pushed by: git
Pushed to: branch 9.2.1-BRANCH
commit cb1d34379e4c90d03ae5b39322ccd881caf0a0a2
Author: Josh Paetzel <josh@...>
Date:   Sat Apr 19 12:58:01 2014 -0700

    I know python, I really do.
---
 gui/middleware/notifier.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gui/middleware/notifier.py b/gui/middleware/notifier.py
index 47aba5d..88c27ba 100644
--- a/gui/middleware/notifier.py
+++ b/gui/middleware/notifier.py
 <at>  <at>  -4144,7 +4144,7  <at>  <at>  class notifier:
         This syncs the EncryptedDisk table with the current state
         of a volume
         """
-        from freenasUI.storage.models import Disk EncryptedDisk, Volume
+        from freenasUI.storage.models import Disk, EncryptedDisk, Volume
         if volume is not None:
             volumes = [volume]
         else:
dev | 19 Apr 21:51 2014

[freenas/freenas] dbe7ada: Fix missing import.

branch: 9.2.1-BRANCH
Repository: freenas/freenas
Pushed by: git
Pushed to: branch 9.2.1-BRANCH
commit dbe7ada4ce190854bbcdbf17e2625f33fb8c4d2b
Author: Josh Paetzel <josh@...>
Date:   Sat Apr 19 12:49:53 2014 -0700

    Fix missing import.

    This is cherry-picked from the commit in master that addressed
    a bunch of pyflakes warnings, however this import missing
    is not innocuous.  It really does break stuff.
---
 gui/middleware/notifier.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gui/middleware/notifier.py b/gui/middleware/notifier.py
index 9f5fe7a..47aba5d 100644
--- a/gui/middleware/notifier.py
+++ b/gui/middleware/notifier.py
 <at>  <at>  -4144,7 +4144,7  <at>  <at>  class notifier:
         This syncs the EncryptedDisk table with the current state
         of a volume
         """
-        from freenasUI.storage.models import EncryptedDisk, Volume
+        from freenasUI.storage.models import Disk EncryptedDisk, Volume
         if volume is not None:
             volumes = [volume]
         else:
(Continue reading)

dev | 19 Apr 21:39 2014

[freenas/freenas] df2b32c: Fix error that slipped though.

branch: 9.2.1-BRANCH
Repository: freenas/freenas
Pushed by: git
Pushed to: branch 9.2.1-BRANCH
commit df2b32c68bec3a26b77b80f9fb8bba1550b0f4a0
Author: Josh Paetzel <josh@...>
Date:   Sat Apr 19 12:36:25 2014 -0700

    Fix error that slipped though.

    Ticket: #4836
---
 gui/middleware/notifier.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gui/middleware/notifier.py b/gui/middleware/notifier.py
index 072b28e..9f5fe7a 100644
--- a/gui/middleware/notifier.py
+++ b/gui/middleware/notifier.py
 <at>  <at>  -3445,11 +3445,11  <at>  <at>  class notifier:
                 if replications:
                     for repl, snaps in replications.iteritems():
                         remotename = '%s <at> %s' % (
-                            bundle.obj.filesystem.replace(
-                                repl.repl_filesystem,
-                                repl.repl_zfs,
+                            fs.replace(
+                                repl.repl_filesystem + ' <at> ',
+                                repl.repl_zfs + ' <at> ',
                             ),
(Continue reading)

dev | 19 Apr 21:37 2014

[freenas/freenas] 126f828: Fix error that slipped though.

branch: master
Repository: freenas/freenas
Pushed by: git
Pushed to: branch master
commit 126f828e865b1109a03086e0871de588dffecacb
Author: Josh Paetzel <josh@...>
Date:   Sat Apr 19 12:36:25 2014 -0700

    Fix error that slipped though.

    Ticket: #4836
---
 gui/middleware/notifier.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gui/middleware/notifier.py b/gui/middleware/notifier.py
index 384e8ec..a21be67 100644
--- a/gui/middleware/notifier.py
+++ b/gui/middleware/notifier.py
 <at>  <at>  -3454,11 +3454,11  <at>  <at>  class notifier:
                 if replications:
                     for repl, snaps in replications.iteritems():
                         remotename = '%s <at> %s' % (
-                            bundle.obj.filesystem.replace(
-                                repl.repl_filesystem,
-                                repl.repl_zfs,
+                            fs.replace(
+                                repl.repl_filesystem + ' <at> ',
+                                repl.repl_zfs + ' <at> ',
                             ),
(Continue reading)

dev | 19 Apr 08:21 2014

[freenas/freenas] 75e340c: Allow certain variables to be overridden in nano_env or os-base.

branch: poudriere
Repository: freenas/freenas
Pushed by: git
Pushed to: branch poudriere
commit 75e340c828332e6790024e34b23526398cd273bb
Author: Craig Rodrigues <rodrigc@...>
Date:   Fri Apr 18 23:18:48 2014 -0700

    Allow certain variables to be overridden in nano_env or os-base.
---
 build/nanobsd/nanobsd_funcs.sh | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/build/nanobsd/nanobsd_funcs.sh b/build/nanobsd/nanobsd_funcs.sh
index c10c6ea..e4f4349 100644
--- a/build/nanobsd/nanobsd_funcs.sh
+++ b/build/nanobsd/nanobsd_funcs.sh
 <at>  <at>  -37,13 +37,13  <at>  <at>  set -e
 #######################################################################

 # Name of this NanoBSD build.  (Used to construct workdir names)
-NANO_NAME=full
+: ${NANO_NAME=full}

 # Source tree directory
-NANO_SRC=/usr/src
+: ${NANO_SRC=/usr/src}

 # Where nanobsd additional files live under the source tree
-NANO_TOOLS=tools/tools/nanobsd
(Continue reading)

dev | 19 Apr 04:39 2014

[freenas/freenas] 41d0d1f: Revert "Support webcams / video capture devices so people can monitor their"

branch: master
Repository: freenas/freenas
Pushed by: git
Pushed to: branch master
commit 41d0d1f3dc43ce01da2745f37f4263a03f8c2210
Author: Jordan K. Hubbard <jkh@...>
Date:   Fri Apr 18 19:39:11 2014 -0700

    Revert "Support webcams / video capture devices so people can monitor their"

    This reverts commit a9f752127a0bfa7cf7e0e1896ebe4acbfeb42f45.
---
 nanobsd/os-ports | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/nanobsd/os-ports b/nanobsd/os-ports
index f9a612b..f0851ff 100644
--- a/nanobsd/os-ports
+++ b/nanobsd/os-ports
 <at>  <at>  -284,12 +284,6  <at>  <at>  add_port_debug net/samba41 \
        OPTIONS_FILE_UNSET+=BIND98 \
        OPTIONS_FILE_UNSET+=BIND99

-# These are for webcam / security cam recording
-if ! is_truenas ; then
-	add_port multimedia/cuse4bsd-kmod
-	add_port multimedia/libv4l MAKE_JOBS_UNSAFE=yes
-	add_port multimedia/webcamd WITHOUT_HAL=y
-fi

(Continue reading)

dev | 19 Apr 04:39 2014

[freenas/freenas] 3140240: Merge branch 'master' of gitserver.ixsystems.com:/git/repos/freenas-build/freenas

branch: master
Repository: freenas/freenas
Pushed by: git
Pushed to: branch master
commit 314024070ce9e4858d9c11a36d82b38e96347c10
Merge: 41d0d1f 3c93274
Author: Jordan K. Hubbard <jkh@...>
Date:   Fri Apr 18 19:39:20 2014 -0700

    Merge branch 'master' of gitserver.ixsystems.com:/git/repos/freenas-build/freenas

 gui/middleware/notifier.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
dev | 19 Apr 04:05 2014

[freenas/freenas] 0a7bc88: Remove debug statement

branch: poudriere
Repository: freenas/freenas
Pushed by: git
Pushed to: branch poudriere
commit 0a7bc88ca661c0fcd8203d9f09ae880eef380ad3
Author: Craig Rodrigues <rodrigc@...>
Date:   Fri Apr 18 16:28:27 2014 -0700

    Remove debug statement
---
 build/ports/build-ports.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/build/ports/build-ports.sh b/build/ports/build-ports.sh
index 5f0e960..e6c4eae 100755
--- a/build/ports/build-ports.sh
+++ b/build/ports/build-ports.sh
 <at>  <at>  -10,7 +10,6  <at>  <at>  TOP="$(pwd)"

 cleanup()
 {
-        set -x
 	umountfs ${NANO_OBJ}/_.w/usr/src
 }

Gmane