I just checked the pncconf branch. You had previously merged master into pncconf. That's fine, since you did that before the 2.5 branch was created from master.
Now, it's important that you NOT merge master into pncconf anymore, because master has many changes that don't belong on the release branches. Merging pncconf into v2.5_branch works perfectly. ------------------------------------------------------------------------------ Colocation vs. Managed Hosting A question and answer guide to determining the best fit for your organization - today and in the future. http://p.sf.net/sfu/internap-sfd2d _______________________________________________ Emc-developers mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/emc-developers
