[pve-devel] [PATCH 1/1] Extend GUI to show new ZFS features

[Michael Rasmussen]

On Thu, 26 Jun 2014 04:11:25 +0000
Dietmar Maurer <dietmar at proxmox.com> wrote:

> Applying: Extend GUI to show new ZFS features
> error: patch failed: www/manager/storage/ZFSEdit.js:61
> error: www/manager/storage/ZFSEdit.js: patch does not apply
> Patch failed at 0001 Extend GUI to show new ZFS features
> ?
> 
Strange?

commit 2ea88ee37985ad6c583ed11a9b1544c23fe67428
Author: Michael Rasmussen <mir at datanom.net>
Date:   Wed Jun 25 20:25:09 2014 +0200

    Extend GUI to show new ZFS features

commit 1619f5786696b612115c180749bb410bdf8049f9
Merge: 69305b8 8816f15
Author: Michael Rasmussen <mir at datanom.net>
Date:   Wed Jun 25 20:13:44 2014 +0200

    Merge branch 'master' of git://git.proxmox.com/git/pve-manager into
    develop

commit 8816f15a22802a1fc78214bc4fc5c3432e2906d1
Author: Dietmar Maurer <dietmar at proxmox.com>
Date:   Wed Jun 25 13:26:37 2014 +0200

    bump version to 3.2-14

I will look into this later today.

-- 
Hilsen/Regards
Michael Rasmussen

Get my public GnuPG keys:
michael <at> rasmussen <dot> cc
http://pgp.mit.edu:11371/pks/lookup?op=get&search=0xD3C9A00E
mir <at> datanom <dot> net
http://pgp.mit.edu:11371/pks/lookup?op=get&search=0xE501F51C
mir <at> miras <dot> org
http://pgp.mit.edu:11371/pks/lookup?op=get&search=0xE3E80917
--------------------------------------------------------------
/usr/games/fortune -es says:
Life is divided into the horrible and the miserable.
		-- Woody Allen, "Annie Hall"
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: not available
URL: <http://lists.proxmox.com/pipermail/pve-devel/attachments/20140626/0cf01097/attachment.sig>