branches updated

[David Kavanagh]

Today, Garrett tagged v4.1.0 which lets us do a few things to prepare for 4.1.1 and 4.2.

What I've done:

 - merged develop into master

 - made master the default branch for the repo

 - created maint-4.1 off the v4.1.0 tag (PRs for 4.1.1 should go against this)

 - created a PR for merging master-4.2 into master. Once it passes CI, I'll merge. 

--

David Kavanagh

Console Team
HP Helion Eucalyptus

d...@hp.com

@David_67

Hewlett-Packard Company

[Kamal Gill]

The PR for merging master-4.2 into master passed the CI tests, so I merged it just now.

BTW, this would be a good time to clean up any old branches that we no longer need.  

There are almost 30 branches open, although a good number of those are probably relevant for 4.1.1 or 4.2.

—Kamal

--

Hewlett-Packard Company

<image001.png>

--
You received this message because you are subscribed to the Google Groups "team-ui" group.
To unsubscribe from this group and stop receiving emails from it, send an email to team-ui+u...@eucalyptus.com.
To post to this group, send email to tea...@eucalyptus.com.
To view this discussion on the web visit https://groups.google.com/a/eucalyptus.com/d/msgid/team-ui/CAOcTqv39spxuQQ2_AtvdqbS9dgZfkArMJ8R-OTzJH%3DX8_sPy1w%40mail.gmail.com.
For more options, visit https://groups.google.com/a/eucalyptus.com/d/optout.

[David Kavanagh]

master - current development

master-4.2 - merged, will delete

develop - can be deleted now

magic_search - PR open against master

maint-4.1 - target for 4.1.1 PRs

security-4.0.2-merge - should be deleted.. who merged it (want to confirm it was merged)?

IAM-tests - Alice?

Ubuntu - Jenny?

GUI-1435 - nothing there. will delete

GUI-801 - decided not to fix, can we delete, Kyo?

GUI-1524 - 4.1.1

GUI-1547 - merged for 4.2, will delete

autscaling-test-fix - nothing, will delete

add-aws-tests - merged, will delete

elb_ui - landing page and delete elb for 4.2.

GUI-1580 - 4.1.1

GUI-1588 - 4.1.1

grunt-watch - Kyo

GUI-1494 - 4.1.1

GUI-1286 - 4.1.1

jshint-fix - Kyo

tests-refactored-4.0.2 - Alice, delete?

GUI-1226 - obsolete, will delete

maint-4.0 - do we need to keep?

GUI-1380 - obsolete, will delete

windows - Alice?

tests-refactored - Alice?

DOC-1452-new - nothing, will delete

DOC-1438 - nothing, will delete

custom_css - do we need to update this from master, Kamal?

OK, that should be it, down to 23 branches.

David

To view this discussion on the web visit https://groups.google.com/a/eucalyptus.com/d/msgid/team-ui/3968FC4B-B032-47CA-AA9E-BB8A658B4054%40eucalyptus.com.

For more options, visit https://groups.google.com/a/eucalyptus.com/d/optout.

--

David Kavanagh

Console Team
HP Helion Eucalyptus

d...@hp.com

@David_67

Hewlett-Packard Company

[Kyo Lee]

Hi folks,

Keeping the branch GUI-801 for future reference since the issue of displaying newly created snapshot on the volume detail page on AWS hasn't fixed. 

Deleted other stale branches created by me.

Thank you!

Kyo

To view this discussion on the web visit https://groups.google.com/a/eucalyptus.com/d/msgid/team-ui/CAOcTqv0BQ1LLRRm%2Bs6kJSHnLrgnqqJgLCa0mfuAn-3fJFMwzTw%40mail.gmail.com.