comanage-dev - [comanage-dev] Update on git branches
Subject: COmanage Developers List
List archive
- From: Benn Oshrin <>
- To:
- Subject: [comanage-dev] Update on git branches
- Date: Sat, 15 Apr 2017 19:59:52 -0400
- Ironport-phdr: 9a23:Wjo3HBVhmzmbrT7Zct6sXIYGJ4jV8LGtZVwlr6E/grcLSJyIuqrYYxOHt8tkgFKBZ4jH8fUM07OQ6PG+HzZaqs/Q6DgrS99lb1c9k8IYnggtUoauKHbQC7rUVRE8B9lIT1R//nu2YgB/Ecf6YEDO8DXptWZBUhrwOhBoKevrB4Xck9q41/yo+53Ufg5EmCexbal8IRiyrAjdrNcajZVtJqoszhbFvmZDdvhLy29vOV+dhQv36N2q/J5k/SRQuvYh+NBFXK7nYak2TqFWASo/PWwt68LlqRfMTQ2U5nsBSWoWiQZHAxLE7B7hQJj8tDbxu/dn1ymbOc32Sq00WSin4qx2RhLklDsLOjgk+2zRl8d+jr9UoAi5qhJhw4DafYKbOvRwcazSYdwUSnFMXtpTWiFbHo+wc4UCAugHMO1Fr4f9vVwOrR6mCASxGuzvzDlIjWLv060h0+QhCwDG3Ao9FN8Jq3vbstP1NKEVUe2uzanIyynDYO1M2Tf79ofIbg4treuSUr1tbMrc0E8iHB7GgFWIsYHpIS+Z2+cXv2Wf7edsT/+jhmA5pw1rvDSj2sQhhpHUio4JyV3I7yt0zJovKdGmVUJ3f8SoHIVfuiyYMYZ9X9ksTHtyuCkgz70LoZ67czYOyJQg3xPfa/uHc42J4h39UeaeOzZ4hHZ8dL2lhxu+60egxvfhWcmuzllFtC9FktnLtnAWyxzf8NSISvx4/ku52DaP0R7c6v1cLEwqiabWKIQtz7oym5YJrEjOEDH6lF/ogKOKdUgo4u2o5P7mYrXiqJ+cLYh0igTmP6s1hMO/B+I4Mg8VUmia/+S8yKPs/Vf/QLpUkv06jLPVv47HKsQGvqK5GRNa0p4/6xajCDeryMgXnX4CLF1ffhKIlYfpNE/XLP/lE/i/nU+hkDNqx/DdIr3hGYvBImLCkLfnYbZy9VRcyAwtwtBD+Z5YEK8OL+/uWhy5iNuNBRg8Ogq9zOuiBNhj/oIYRW+VBKKFauXfvULbyPgoJrymaYkT8BHmK+Ik4ba6h3I/n1g1fK+10IERZWziWPlqPhPKMjLXnt4dHDJS7UIFR+vwhQjaXA==
I've merged Arlen's new UI (3.0.0) work into develop, and created a new
feature branch for 3.1.0 work. Here's where things stand with the
various branches:
develop - Will become 3.0.0, only UI related work should go here
feature-3.1 - Will become 3.1.0, any new features should go here
hotfix-2.0.x - Bug fixes for 2.0 should go here
feature-3.1 is branched from develop, so it has the new UI. We'll
periodically merge develop into feature-3.1 until 3.0.0 is released,
then feature-3.1 will merge back into develop.
Do NOT commit to hotfix-1.0.x or master. You can continue to use
feature-JIRA branches if you prefer, which will merge into develop,
feature-3.1, or hotfix-2.0.x as appropriate. (Arlen, you can now just
work directly against develop, no need to continue with feature-co1301.)
Let me know if you have any questions...
Thanks,
-Benn-
- [comanage-dev] Update on git branches, Benn Oshrin, 04/16/2017
Archive powered by MHonArc 2.6.19.