Jason,
I've not made any changes to code at this point. It would be good to see
the svn directions, and I'll look forward to seeing 1.1 when it comes out.
Thanks for the continued help,
Chris
Jason Stevens <[EMAIL PROTECTED]>
Sent by: [EMAIL PROTECTED]
01/22/2007 10:47 AM
Please respond to
General discussion of using zenoss system <[email protected]>
To
General discussion of using zenoss system <[email protected]>
cc
Subject
Re: [zenoss-users] Upgrade to latest SVN failes
Chris,
This line in interesting:
<<<<<<< .mine
It means that svn encountered some conflicts trying to update your source
files. In this case it's probably because there was a bug fix in the
1.0.x branch that it can't reconcile with the svn trunk. This can also
happen if you've made edits to source files that svn can't merge with the
latest versions.
I can walk you through doing an svn install if you'd like. Another option
is to upgrade using the zenoss 1.1 tarball which should be out this week.
Let me know if you'd like svn directions.
-jason_______________________________________________
zenoss-users mailing list
[email protected]
http://lists.zenoss.org/mailman/listinfo/zenoss-users
NOTE: The information contained in this message may be privileged and
confidential and protected from disclosure. If the reader of this message
is not the intended recipient, you are hereby notified that any
dissemination, distribution or copying of this communication is strictly
prohibited. If you have received this communication in error, please
notify us immediately by replying to the message and deleting it from your
computer.
--------------------------------------
VCU Health System
http://www.vcuhealth.org
_______________________________________________
zenoss-users mailing list
[email protected]
http://lists.zenoss.org/mailman/listinfo/zenoss-users