freenas | 28 Nov 18:49 2014

[freenas/freenas] b557176: Do not use negative position which layers on top of another widget

branch: master
Repository: freenas/freenas
Pushed by: git
Pushed to: branch master
commit b5571768d0399fd75942b22732671c76a90d71af
Author: William Grzybowski <wg@...>
Date:   Fri Nov 28 15:48:54 2014 -0200

    Do not use negative position which layers on top of another widget

    Ticket:	#6827
---
 gui/freeadmin/static/css/layout.css         | 1 -
 gui/templates/freeadmin/selectmultiple.html | 2 --
 2 files changed, 3 deletions(-)

diff --git a/gui/freeadmin/static/css/layout.css b/gui/freeadmin/static/css/layout.css
index f907fcf..61966b8 100755
--- a/gui/freeadmin/static/css/layout.css
+++ b/gui/freeadmin/static/css/layout.css
 <at>  <at>  -138,7 +138,6  <at>  <at>  body, html { overflow:hidden; width:100%; height:100%; margin:0; padding:0; }
     text-align:center;
     width:7%;
     position:relative;
-    top:-26px;
     float:left;
 }
 .select-selected {
diff --git a/gui/templates/freeadmin/selectmultiple.html b/gui/templates/freeadmin/selectmultiple.html
index c5a611c..6c9e7b7 100644
(Continue reading)

freenas | 28 Nov 16:41 2014

[freenas/freenas] c42b8a7: Fix shown inherit value

branch: master
Repository: freenas/freenas
Pushed by: git
Pushed to: branch master
commit c42b8a7811001c02e4e05617a07f5523f8b1a09a
Author: William Grzybowski <wg@...>
Date:   Fri Nov 28 13:40:51 2014 -0200

    Fix shown inherit value

    Ticket:	#6820
---
 gui/storage/forms.py | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/gui/storage/forms.py b/gui/storage/forms.py
index 5a37c3c..5b1e610 100644
--- a/gui/storage/forms.py
+++ b/gui/storage/forms.py
 <at>  <at>  -1349,22 +1349,20  <at>  <at>  class ZFSDataset(Form):
         self._create = kwargs.pop('create', True)
         super(ZFSDataset, self).__init__(*args, **kwargs)
         _n = notifier()
-        if '/' in self._fs:
-            parentds = self._fs.rsplit('/', 1)[0]
-            parentdata = _n.zfs_get_options(parentds)
+        parentdata = _n.zfs_get_options(self._fs)

-            self.fields['dataset_atime'].choices = _inherit_choices(
-                choices.ZFS_AtimeChoices,
(Continue reading)

freenas | 28 Nov 16:17 2014

[freenas/freenas] 8c4f574: Log all exceptions from API

branch: master
Repository: freenas/freenas
Pushed by: git
Pushed to: branch master
commit 8c4f57426556b242dc79620b2364a4586fc183c7
Author: William Grzybowski <wg@...>
Date:   Fri Nov 28 13:17:02 2014 -0200

    Log all exceptions from API
---
 gui/api/utils.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/gui/api/utils.py b/gui/api/utils.py
index fb09141..1128406 100644
--- a/gui/api/utils.py
+++ b/gui/api/utils.py
 <at>  <at>  -35,6 +35,7  <at>  <at>  from django.db.models.fields.related import ForeignKey
 from django.http import QueryDict

 from freenasUI.account.models import bsdUsers
+from freenasUI.common.log import log_traceback
 from freenasUI.freeadmin.apppool import appPool
 from freenasUI.freeadmin.models.fields import MultiSelectField
 from freenasUI.middleware.exceptions import MiddlewareError
 <at>  <at>  -229,11 +230,15  <at>  <at>  class ResourceMixin(object):
                 request_type, request, *args, **kwargs
             )
         except (MiddlewareError, ServiceFailed, UnsupportedFormat), e:
+            log_traceback(log=log)
(Continue reading)

freenas | 28 Nov 07:53 2014

[freenas/freenas] 3edbc29: Prefer fail than silently proceeding.

branch: master
Repository: freenas/freenas
Pushed by: git
Pushed to: branch master
commit 3edbc29da3a5e87485272c86c4e8abd3777e7d4a
Author: Xin Li <delphij@...>
Date:   Thu Nov 27 22:53:32 2014 -0800

    Prefer fail than silently proceeding.
---
 build/nanobsd-cfg/GUI_Upgrade/install/0200.run_update.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/build/nanobsd-cfg/GUI_Upgrade/install/0200.run_update.sh b/build/nanobsd-cfg/GUI_Upgrade/install/0200.run_update.sh
index 61f9ae9..ab8d253 100644
--- a/build/nanobsd-cfg/GUI_Upgrade/install/0200.run_update.sh
+++ b/build/nanobsd-cfg/GUI_Upgrade/install/0200.run_update.sh
 <at>  <at>  -183,9 +183,13  <at>  <at>  trampoline_upgrade()

 echo -n "Extracting upgrade image, please wait..."

+set -e
+# These must all succeed and there is no automated way to recover
+# from fails.
 /rescue/mount -o ro /dev/${ROOTDEV}s${TRAMPOLINE_SLICE}a /mnt
 /rescue/mount -t tmpfs tmpfs /installer
 /rescue/mkdir -p /installer/.mount/${AVATAR_PROJECT}
+set +e

 /rescue/tar xf /mnt/gui-install-environment.tar  -C /installer || (echo "FAILED BASE EXTRACTION" &&
(Continue reading)

freenas | 28 Nov 07:27 2014

[freenas/freenas] 8166c92: Reload "disk" after unlocking disk.

branch: master
Repository: freenas/freenas
Pushed by: git
Pushed to: branch master
commit 8166c9250d5552093c21646a8d05755117b8dd07
Author: Xin Li <delphij@...>
Date:   Thu Nov 27 22:27:05 2014 -0800

    Reload "disk" after unlocking disk.

    Ticket: #6833
---
 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 614514e..5a37c3c 100644
--- a/gui/storage/forms.py
+++ b/gui/storage/forms.py
 <at>  <at>  -2522,7 +2522,7  <at>  <at>  class UnlockPassphraseForm(Form):
         for svc in self.cleaned_data.get("services"):
             _notifier.restart(svc)
         _notifier.restart("system_datasets")
-
+        _notifier.reload("disk")

 class KeyForm(Form):
freenas | 27 Nov 23:23 2014

[freenas/freenas] 1b5f18d: Add a method to get a train changelog.

branch: master
Repository: freenas/freenas
Pushed by: git
Pushed to: branch master
commit 1b5f18d7a2341b885c31bf95b7dab256e2cbd252
Author: Sean Eric Fagan <sef@...>
Date:   Thu Nov 27 14:23:00 2014 -0800

    Add a method to get a train changelog.
---
 src/freenas-pkgtools/lib/Configuration.py | 17 +++++++++++++++++
 src/freenas-pkgtools/lib/Update.py        |  3 +++
 2 files changed, 20 insertions(+)

diff --git a/src/freenas-pkgtools/lib/Configuration.py b/src/freenas-pkgtools/lib/Configuration.py
index d2911e5..47a3d56 100644
--- a/src/freenas-pkgtools/lib/Configuration.py
+++ b/src/freenas-pkgtools/lib/Configuration.py
 <at>  <at>  -911,6 +911,23  <at>  <at>  class Configuration(object):
             pass
         return None

+    def GetChangeLog(self, train, save_dir = None, handler = None):
+        # Look for the changelog file for the specific train, and attempt to
+        # download it.  If save_dir is set, save it as save_dir/ChangeLog.txt
+        # Returns a file for the ChangeLog, or None if it can't be found.
+        changelog_url = "%s/%s/ChangeLog.txt" % (UPDATE_SERVER, train)
+        if save_dir:
+            save_path = "%s/ChangeLog.txt" % save_dir
+        else:
(Continue reading)

freenas | 27 Nov 21:17 2014

[freenas/freenas] 93b9240: Step 2 of having a change log to support Jordan.

branch: master
Repository: freenas/freenas
Pushed by: git
Pushed to: branch master
commit 93b9240ec1c20ac6e02bfe839d427d7c7396998b
Author: Sean Eric Fagan <sef@...>
Date:   Thu Nov 27 12:15:18 2014 -0800

    Step 2 of having a change log to support Jordan.

    This uses CHANGELOG as a variable indicating a file, or
    "-" for stdin; it copies it to the update server, which then
    adds it to ${archive}/${project}/${train}/ChangeLog.txt; it is
    bracketed with '### START <sequence>' and '### END <sequence>'.
---
 Makefile                 |  4 ++++
 build/post-to-upgrade.sh | 30 ++++++++++++++++++++++++------
 2 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index d9603be..b0433b1 100644
--- a/Makefile
+++ b/Makefile
 <at>  <at>  -25,6 +25,10  <at>  <at>  ENV_SETUP=env NANO_LABEL=${NANO_LABEL} VERSION=${VERSION} GIT_LOCATION=${GIT_LOC
 ENV_SETUP+= TRAIN=${TRAIN}
 ENV_SETUP+= UPDATE_USER=sef	# For now, just use sef's account
 ENV_SETUP+= FREENAS_KEYFILE=${FREENAS_KEYFILE}
+.if defined(CHANGELOG)
+ENV_SETUP+= CHANGLOG=${CHANGELOG}
+.endif
(Continue reading)

freenas | 27 Nov 17:45 2014

[freenas/freenas] 9f88fca: Raise alert level to CRITICAL

branch: master
Repository: freenas/freenas
Pushed by: git
Pushed to: branch master
commit 9f88fca58db765f504f6930a9dbc9c44c265c64c
Author: William Grzybowski <wg@...>
Date:   Thu Nov 27 14:44:47 2014 -0200

    Raise alert level to CRITICAL

    Ticket:	#6808
---
 gui/system/alertmods/volume_status.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gui/system/alertmods/volume_status.py b/gui/system/alertmods/volume_status.py
index d98fd50..f3c5049 100644
--- a/gui/system/alertmods/volume_status.py
+++ b/gui/system/alertmods/volume_status.py
 <at>  <at>  -18,7 +18,7  <at>  <at>  class VolumeStatusAlert(BaseAlert):
     def on_volume_status_not_healthy(self, vol, status, message):
         if message:
             return Alert(
-                Alert.WARN,
+                Alert.CRIT,
                 _('The volume %(volume)s status is %(status)s:'
                   ' %(message)s') % {
                     'volume': vol,
 <at>  <at>  -28,7 +28,7  <at>  <at>  class VolumeStatusAlert(BaseAlert):
             )
(Continue reading)

freenas | 27 Nov 17:40 2014

[freenas/freenas] 1595432: Set the initial value for console message in the Wizard

branch: master
Repository: freenas/freenas
Pushed by: git
Pushed to: branch master
commit 1595432afe6a0b38335511bcbe3c5342f647d73b
Author: William Grzybowski <wg@...>
Date:   Thu Nov 27 14:39:57 2014 -0200

    Set the initial value for console message in the Wizard

    Ticket:	#6826
---
 gui/system/forms.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/gui/system/forms.py b/gui/system/forms.py
index 751b69e..e96cc58 100644
--- a/gui/system/forms.py
+++ b/gui/system/forms.py
 <at>  <at>  -939,7 +939,7  <at>  <at>  class SettingsForm(ModelForm):
     def clean(self):
         cdata = self.cleaned_data
         proto = cdata.get("stg_guiprotocol")
-        if proto == "http": 
+        if proto == "http":
             return cdata

         certificate = cdata["stg_guicertificate"]
 <at>  <at>  -2036,6 +2036,11  <at>  <at>  class InitialWizardSystemForm(Form):
             self.fields[fname] = field
(Continue reading)

freenas | 27 Nov 15:12 2014

[freenas/freenas] 70e9848: Exclude volumes with same guid from the import form

branch: master
Repository: freenas/freenas
Pushed by: git
Pushed to: branch master
commit 70e98488f5a7f08815450f75601550d30d573128
Author: William Grzybowski <wg@...>
Date:   Thu Nov 27 12:12:10 2014 -0200

    Exclude volumes with same guid from the import form

    Ticket:	#6808
---
 gui/storage/forms.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/gui/storage/forms.py b/gui/storage/forms.py
index c676c5e..614514e 100644
--- a/gui/storage/forms.py
+++ b/gui/storage/forms.py
 <at>  <at>  -1047,7 +1047,9  <at>  <at>  class VolumeAutoImportForm(Form):

         diskchoices = dict()
         used_disks = []
+        guids = []
         for v in models.Volume.objects.all():
+            guids.append(v.vol_guid)
             used_disks.extend(v.get_disks())

         # Grab partition list
 <at>  <at>  -1055,6 +1057,11  <at>  <at>  class VolumeAutoImportForm(Form):
(Continue reading)

freenas | 27 Nov 15:08 2014

[freenas/freenas] 62148a7: Use a more descriptive message for upgrading volume

branch: master
Repository: freenas/freenas
Pushed by: git
Pushed to: branch master
commit 62148a7b55249852e48382b8d318c3b4a2be44b8
Author: William Grzybowski <wg@...>
Date:   Thu Nov 27 12:07:31 2014 -0200

    Use a more descriptive message for upgrading volume

    While I'm here remove deprecated stuff.

    Ticket:	#6823
---
 gui/system/alertmods/volume_version.py | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/gui/system/alertmods/volume_version.py b/gui/system/alertmods/volume_version.py
index c52157c..dfbf4c2 100644
--- a/gui/system/alertmods/volume_version.py
+++ b/gui/system/alertmods/volume_version.py
 <at>  <at>  -1,8 +1,5  <at>  <at> 
-import subprocess
-
 from django.utils.translation import ugettext as _

-from freenasUI.middleware.notifier import notifier
 from freenasUI.storage.models import Volume
 from freenasUI.system.alert import alertPlugins, Alert, BaseAlert

(Continue reading)


Gmane