[pve-devel] NOTE: pve-manager repository rebased

Wolfgang Bumiller w.bumiller at proxmox.com
Fri Jan 22 11:49:32 CET 2016


The pve-manager repository has now been rebased from the point where the
extjs6 sources were included.

The only change in the history is that the extjs zip file is now unpacked,
so any current branches that can be rebased on the original master branch
should also rebase cleanly on the new master branch (or at the very least
be 'git cherry-pick'-able onto it).

The old branch is still available as 'master-old' for documentation purposes.

If you have no changes in your copy of the master branch you need to
$ git pull --force

@Alexandre:
I already updated my github's repository. The new rebased cloudinit branch
is just named 'cloudinit' now (previously wbumiller/cloudinit).

Here's the rationale (from: [pve-devel] cloudinit support for proxmox 4.2 ?):

> On January 22, 2016 at 9:34 AM Wolfgang Bumiller <w.bumiller at proxmox.com> wrote:
> 
> > On January 22, 2016 at 9:12 AM Dietmar Maurer <dietmar at proxmox.com> wrote:
> > 
> > > however the
> > > pve-manager repository has become too big to push to github now with
> > > the extjs6 package inside.
> > 
> > sigh! Any idea how we can fix that?
> 
> To make it github-compatible? Only by removing all the unnecessary
> parts of the package from the entire repository history. :-/




More information about the pve-devel mailing list