freenas | 3 Jul 22:18 2015

[freenas/freenas] 22fe858: Split SSH helper functions out into their own module.

branch: freenas10/development
Repository: freenas/freenas
Pushed by: git
Pushed to: branch freenas10/development
commit 22fe8589b15039f8f45c4a096a4edb81fd428cd9
Author: Corey Vixie <corey.vixie@...>
Date:   Fri Jul 3 10:35:20 2015 -0700

    Split SSH helper functions out into their own module.
---
 src/gui/grunt_tasks/common/ssh-helpers.js    | 70 +++++++++++++++++++++++
 src/gui/grunt_tasks/config/ssh-multi-exec.js | 84 +++++-----------------------
 2 files changed, 83 insertions(+), 71 deletions(-)

diff --git a/src/gui/grunt_tasks/common/ssh-helpers.js b/src/gui/grunt_tasks/common/ssh-helpers.js
new file mode 100644
index 0000000..a06dbe3
--- /dev/null
+++ b/src/gui/grunt_tasks/common/ssh-helpers.js
 <at>  <at>  -0,0 +1,70  <at>  <at> 
+// SSH HELPERS
+
+"use strict";
+
+var chalk = require( "chalk" );
+
+var SshHelpers = function ( grunt ) {
+  // Test that a response was issued, and that it contains the provided string
+  this.logSshMsg = function ( string, chalkClass ) {
+    grunt.log.writeln( "Status: " +
(Continue reading)

freenas | 3 Jul 22:18 2015

[freenas/freenas] 8f4a332: There are no HTML templates anymore. Removing references.

branch: freenas10/development
Repository: freenas/freenas
Pushed by: git
Pushed to: branch freenas10/development
commit 8f4a3325db8d5f803dde4cb8f567e6232247b915
Author: Corey Vixie <corey.vixie@...>
Date:   Fri Jul 3 10:04:50 2015 -0700

    There are no HTML templates anymore. Removing references.
---
 src/gui/Gruntfile.js                | 1 -
 src/gui/grunt_tasks/config/copy.js  | 1 -
 src/gui/grunt_tasks/config/watch.js | 1 -
 3 files changed, 3 deletions(-)

diff --git a/src/gui/Gruntfile.js b/src/gui/Gruntfile.js
index f685554..ba7c95f 100644
--- a/src/gui/Gruntfile.js
+++ b/src/gui/Gruntfile.js
 <at>  <at>  -62,7 +62,6  <at>  <at>  module.exports = function ( grunt ) {
                      , favicons: "app/source/favicons"
                      , jsx: "app/jsx"
                      , styles: "app/source/styles"
-                     , templates: "app/templates"
                      };

   var buildConfig = { root: "app/build/"
diff --git a/src/gui/grunt_tasks/config/copy.js b/src/gui/grunt_tasks/config/copy.js
index 42aafe2..0eca4cb 100644
--- a/src/gui/grunt_tasks/config/copy.js
(Continue reading)

freenas | 3 Jul 20:38 2015

[freenas/freenas] f419126: Turn on "Disable Physical Block Size" by default for upgrades

branch: TN-9.3-STABLE
Repository: freenas/freenas
Pushed by: unknown user
Pushed to: branch TN-9.3-STABLE
commit f419126df2aecf86f692464dbc9ead6252abb926
Author: William Grzybowski <wg@...>
Date:   Fri Jul 3 15:36:57 2015 -0300

    Turn on "Disable Physical Block Size" by default for upgrades

    For new extents it is still turned off.

    Ticket:	#10400
    Merge-FN93:	yes
    Merge-TN93:	yes
    (cherry picked from commit 477497ee1f5b2ea4a37a6e542798deb92af80793)
---
 ..._add_field_iscsitargetextent_iscsi_target_extent_blocksize__add_f.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git
a/gui/services/migrations/0156_auto__add_field_iscsitargetextent_iscsi_target_extent_blocksize__add_f.py b/gui/services/migrations/0156_auto__add_field_iscsitargetextent_iscsi_target_extent_blocksize__add_f.py
index c286523..0c6696d 100644
--- a/gui/services/migrations/0156_auto__add_field_iscsitargetextent_iscsi_target_extent_blocksize__add_f.py
+++ b/gui/services/migrations/0156_auto__add_field_iscsitargetextent_iscsi_target_extent_blocksize__add_f.py
 <at>  <at>  -15,7 +15,7  <at>  <at>  class Migration(SchemaMigration):

         # Adding field 'iSCSITargetExtent.iscsi_target_extent_pblocksize'
         db.add_column(u'services_iscsitargetextent', 'iscsi_target_extent_pblocksize',
-                      self.gf('django.db.models.fields.BooleanField')(default=0),
(Continue reading)

freenas | 3 Jul 20:38 2015

[freenas/freenas] e890b64: Turn on "Disable Physical Block Size" by default for upgrades

branch: 9.3-STABLE
Repository: freenas/freenas
Pushed by: unknown user
Pushed to: branch 9.3-STABLE
commit e890b6476dac848ae8da8f9c6496d37df5dbff94
Author: William Grzybowski <wg@...>
Date:   Fri Jul 3 15:36:57 2015 -0300

    Turn on "Disable Physical Block Size" by default for upgrades

    For new extents it is still turned off.

    Ticket:	#10400
    Merge-FN93:	yes
    Merge-TN93:	yes
    (cherry picked from commit 477497ee1f5b2ea4a37a6e542798deb92af80793)
---
 ..._add_field_iscsitargetextent_iscsi_target_extent_blocksize__add_f.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git
a/gui/services/migrations/0156_auto__add_field_iscsitargetextent_iscsi_target_extent_blocksize__add_f.py b/gui/services/migrations/0156_auto__add_field_iscsitargetextent_iscsi_target_extent_blocksize__add_f.py
index c286523..0c6696d 100644
--- a/gui/services/migrations/0156_auto__add_field_iscsitargetextent_iscsi_target_extent_blocksize__add_f.py
+++ b/gui/services/migrations/0156_auto__add_field_iscsitargetextent_iscsi_target_extent_blocksize__add_f.py
 <at>  <at>  -15,7 +15,7  <at>  <at>  class Migration(SchemaMigration):

         # Adding field 'iSCSITargetExtent.iscsi_target_extent_pblocksize'
         db.add_column(u'services_iscsitargetextent', 'iscsi_target_extent_pblocksize',
-                      self.gf('django.db.models.fields.BooleanField')(default=0),
(Continue reading)

freenas | 3 Jul 20:37 2015

[freenas/freenas] 477497e: Turn on "Disable Physical Block Size" by default for upgrades

branch: master
Repository: freenas/freenas
Pushed by: git
Pushed to: branch master
commit 477497ee1f5b2ea4a37a6e542798deb92af80793
Author: William Grzybowski <wg@...>
Date:   Fri Jul 3 15:36:57 2015 -0300

    Turn on "Disable Physical Block Size" by default for upgrades

    For new extents it is still turned off.

    Ticket:	#10400
    Merge-FN93:	yes
    Merge-TN93:	yes
---
 ..._add_field_iscsitargetextent_iscsi_target_extent_blocksize__add_f.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git
a/gui/services/migrations/0156_auto__add_field_iscsitargetextent_iscsi_target_extent_blocksize__add_f.py b/gui/services/migrations/0156_auto__add_field_iscsitargetextent_iscsi_target_extent_blocksize__add_f.py
index c286523..0c6696d 100644
--- a/gui/services/migrations/0156_auto__add_field_iscsitargetextent_iscsi_target_extent_blocksize__add_f.py
+++ b/gui/services/migrations/0156_auto__add_field_iscsitargetextent_iscsi_target_extent_blocksize__add_f.py
 <at>  <at>  -15,7 +15,7  <at>  <at>  class Migration(SchemaMigration):

         # Adding field 'iSCSITargetExtent.iscsi_target_extent_pblocksize'
         db.add_column(u'services_iscsitargetextent', 'iscsi_target_extent_pblocksize',
-                      self.gf('django.db.models.fields.BooleanField')(default=0),
+                      self.gf('django.db.models.fields.BooleanField')(default=1),
(Continue reading)

freenas | 3 Jul 20:33 2015

[freenas/freenas] 25de81b: Fix a traceback on multiple choices validation error

branch: 9.3-STABLE
Repository: freenas/freenas
Pushed by: unknown user
Pushed to: branch 9.3-STABLE
commit 25de81bfb86933ba63f09d642af09f5a78a0f65c
Author: William Grzybowski <wg@...>
Date:   Fri Jul 3 15:31:34 2015 -0300

    Fix a traceback on multiple choices validation error

    Ticket:	#10361
    Merge-FN93:	yes
    Merge-TN93:	yes
    (cherry picked from commit 9e54f0c9f74e5d829abb31499c8651bcf1658a6c)
---
 gui/freeadmin/models/fields.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/gui/freeadmin/models/fields.py b/gui/freeadmin/models/fields.py
index 8c1923f..a87cde4 100644
--- a/gui/freeadmin/models/fields.py
+++ b/gui/freeadmin/models/fields.py
 <at>  <at>  -161,7 +161,10  <at>  <at>  class MultiSelectField(models.Field):
             for choice in value:
                 if choice not in valid_choices:
                     raise ValidationError(
-                        self.error_messages['invalid_choice'] % choice)
+                        self.error_messages['invalid_choice'] % {
+                            'value': choice
+                        }
(Continue reading)

freenas | 3 Jul 20:33 2015

[freenas/freenas] b079420: Fix a traceback on multiple choices validation error

branch: TN-9.3-STABLE
Repository: freenas/freenas
Pushed by: unknown user
Pushed to: branch TN-9.3-STABLE
commit b0794208772231eb340c36be0b83bfa7104fa9db
Author: William Grzybowski <wg@...>
Date:   Fri Jul 3 15:31:34 2015 -0300

    Fix a traceback on multiple choices validation error

    Ticket:	#10361
    Merge-FN93:	yes
    Merge-TN93:	yes
    (cherry picked from commit 9e54f0c9f74e5d829abb31499c8651bcf1658a6c)
---
 gui/freeadmin/models/fields.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/gui/freeadmin/models/fields.py b/gui/freeadmin/models/fields.py
index 8c1923f..a87cde4 100644
--- a/gui/freeadmin/models/fields.py
+++ b/gui/freeadmin/models/fields.py
 <at>  <at>  -161,7 +161,10  <at>  <at>  class MultiSelectField(models.Field):
             for choice in value:
                 if choice not in valid_choices:
                     raise ValidationError(
-                        self.error_messages['invalid_choice'] % choice)
+                        self.error_messages['invalid_choice'] % {
+                            'value': choice
+                        }
(Continue reading)

freenas | 3 Jul 20:32 2015

[freenas/freenas] 9e54f0c: Fix a traceback on multiple choices validation error

branch: master
Repository: freenas/freenas
Pushed by: git
Pushed to: branch master
commit 9e54f0c9f74e5d829abb31499c8651bcf1658a6c
Author: William Grzybowski <wg@...>
Date:   Fri Jul 3 15:31:34 2015 -0300

    Fix a traceback on multiple choices validation error

    Ticket:	#10361
    Merge-FN93:	yes
    Merge-TN93:	yes
---
 gui/freeadmin/models/fields.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/gui/freeadmin/models/fields.py b/gui/freeadmin/models/fields.py
index 8c1923f..a87cde4 100644
--- a/gui/freeadmin/models/fields.py
+++ b/gui/freeadmin/models/fields.py
 <at>  <at>  -161,7 +161,10  <at>  <at>  class MultiSelectField(models.Field):
             for choice in value:
                 if choice not in valid_choices:
                     raise ValidationError(
-                        self.error_messages['invalid_choice'] % choice)
+                        self.error_messages['invalid_choice'] % {
+                            'value': choice
+                        }
+                    )
(Continue reading)

freenas | 3 Jul 10:14 2015

[freenas/freenas] 9dd9d47: Fix KeyError in ServiceManageTask.

branch: freenas10/development
Repository: freenas/freenas
Pushed by: git
Pushed to: branch freenas10/development
commit 9dd9d4765c678e1ac6a67017306f8e835bf9a85c
Author: Jakub Klama <jakub@...>
Date:   Fri Jul 3 10:14:51 2015 +0200

    Fix KeyError in ServiceManageTask.
---
 src/dispatcher/plugins/ServiceManagePlugin.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/dispatcher/plugins/ServiceManagePlugin.py b/src/dispatcher/plugins/ServiceManagePlugin.py
index 33a94c2..e9abdf3 100644
--- a/src/dispatcher/plugins/ServiceManagePlugin.py
+++ b/src/dispatcher/plugins/ServiceManagePlugin.py
 <at>  <at>  -37,6 +37,7  <at>  <at>  from dispatcher.rpc import SchemaHelper as h
 from datastore.config import ConfigNode
 from lib.system import system, SubprocessException
 from fnutils import template, first_or_default
+from fnutils.query import wrap

 
 logger = logging.getLogger('ServiceManagePlugin')
 <at>  <at>  -147,7 +148,7  <at>  <at>  class ServiceManageTask(Task):

     def run(self, name, action):
         ld = launchd.Launchd()
-        service = self.datastore.get_one('service-definitions', ('name', '=', name))
(Continue reading)

freenas | 3 Jul 10:14 2015

[freenas/freenas] 8ccc8cf: service.manage task actions are now spelled upper-case.

branch: freenas10/development
Repository: freenas/freenas
Pushed by: git
Pushed to: branch freenas10/development
commit 8ccc8cf21008193a3d994714886409e719519a44
Author: Jakub Klama <jakub@...>
Date:   Fri Jul 3 10:13:17 2015 +0200

    service.manage task actions are now spelled upper-case.
---
 src/cli/plugins/service.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/cli/plugins/service.py b/src/cli/plugins/service.py
index 3b4d654..e5bde4c 100644
--- a/src/cli/plugins/service.py
+++ b/src/cli/plugins/service.py
 <at>  <at>  -69,10 +69,10  <at>  <at>  class ServicesNamespace(RpcBasedLoadMixin, EntityNamespace):
         self.allow_edit = False
         self.allow_creation = False
         self.entity_commands = lambda this: {
-            'start': ServiceManageCommand(this, 'start'),
-            'stop': ServiceManageCommand(this, 'stop'),
-            'restart': ServiceManageCommand(this, 'restart'),
-            'reload': ServiceManageCommand(this, 'reload')
+            'start': ServiceManageCommand(this, 'START'),
+            'stop': ServiceManageCommand(this, 'STOP'),
+            'restart': ServiceManageCommand(this, 'RESTART'),
+            'reload': ServiceManageCommand(this, 'RELOAD')
         }
(Continue reading)

freenas | 3 Jul 04:47 2015

[freenas/freenas] 025fac2: Implement VDEVDisks to add delete capability and (in the future) allow adding more information to disk items.

branch: freenas10/development
Repository: freenas/freenas
Pushed by: git
Pushed to: branch freenas10/development
commit 025fac20b6a4c05f96d9e18ebf35afeeff012675
Author: Ben Milman <bpmilman@...>
Date:   Thu Jul 2 19:46:05 2015 -0700

    Implement VDEVDisks to add delete capability and (in the future) allow adding more information to disk items.

    Ticket: #9634
---
 src/gui/app/jsx/views/Storage/Volumes/VDEV.jsx     | 26 +++++++++++--
 src/gui/app/jsx/views/Storage/Volumes/VDEVDisk.jsx | 45 +++++++++++++++++++++-
 2 files changed, 66 insertions(+), 5 deletions(-)

diff --git a/src/gui/app/jsx/views/Storage/Volumes/VDEV.jsx b/src/gui/app/jsx/views/Storage/Volumes/VDEV.jsx
index 866a68e..3f6f707 100644
--- a/src/gui/app/jsx/views/Storage/Volumes/VDEV.jsx
+++ b/src/gui/app/jsx/views/Storage/Volumes/VDEV.jsx
 <at>  <at>  -76,7 +76,15  <at>  <at>  const VDEV = React.createClass(

       case "disk":
         memberDisks = (
-          <h4>{ this.props.path }</h4>
+          <VDEVDisk
+            path             = { this.props.path }
+            volumeKey        = { this.props.volumeKey }
+            vdevKey          = { this.props.vdevKey }
+            vdevPurpose      = { this.props.purpose }
(Continue reading)


Gmane