[CalendarServer] #275: Please merge the more-kerberos branch into trunk
#275: Please merge the more-kerberos branch into trunk -----------------------------+---------------------------------------------- Reporter: agx@sigxcpu.org | Owner: wsanchez@apple.com Type: Defect | Status: new Priority: 5: Not set | Milestone: Component: PyKerberos | Version: Severity: Other | Keywords: -----------------------------+---------------------------------------------- Hi, we currently have to branches in pykerberos: trunk (with pw changing support) and more-kerberos with basic wrap/unwarp support (enough to to handle imaps, the API is extendable). Can these please be merged since tracking both seems more work then necessary. -- Guido -- Ticket URL: <https://trac.calendarserver.org/ticket/275> CalendarServer </> HTTP/WebDAV/CalDAV Server
#275: Please merge the more-kerberos branch into trunk -----------------------------+---------------------------------------------- Reporter: agx@sigxcpu.org | Owner: wsanchez@apple.com Type: Defect | Status: new Priority: 5: Not set | Milestone: Component: PyKerberos | Version: Severity: Other | Resolution: Keywords: | -----------------------------+---------------------------------------------- Comment (by wsanchez@apple.com): OK, quick merge isn't gonna happen cuz there are conflicts... A clean patch file would help. So might getting Guido commit access... -- Ticket URL: <https://trac.calendarserver.org/ticket/275#comment:1> CalendarServer </> HTTP/WebDAV/CalDAV Server
#275: Please merge the more-kerberos branch into trunk -----------------------------+---------------------------------------------- Reporter: agx@sigxcpu.org | Owner: wsanchez@apple.com Type: Defect | Status: new Priority: 5: Not set | Milestone: Component: PyKerberos | Version: Severity: Other | Resolution: Keywords: | -----------------------------+---------------------------------------------- Comment (by agx@sigxcpu.org): I cherry-picked the relevant changes from the branch using git. The first to are what was in Tickets #213 and #214, the last one was a cleanup from Cyrus. Should apply cleanly now. Oh. - the new site layout of macosforge looks quiet horrible in iceweasel/firefox. The pagelayout is completely screwed. Might be worth checking out, cause it might scare of potential contributors. -- Ticket URL: <https://trac.calendarserver.org/ticket/275#comment:2> CalendarServer </> HTTP/WebDAV/CalDAV Server
#275: Please merge the more-kerberos branch into trunk -----------------------------+---------------------------------------------- Reporter: agx@sigxcpu.org | Owner: wsanchez@apple.com Type: Defect | Status: new Priority: 3: Important | Milestone: 2.0 Component: PyKerberos | Version: Severity: Other | Resolution: Keywords: | -----------------------------+---------------------------------------------- Changes (by wsanchez@apple.com): * priority: 5: Not set => 3: Important * milestone: => 2.0 Comment: Done, thanks. -- Ticket URL: <https://trac.calendarserver.org/ticket/275#comment:3> CalendarServer </> HTTP/WebDAV/CalDAV Server
#275: Please merge the more-kerberos branch into trunk -----------------------------+---------------------------------------------- Reporter: agx@sigxcpu.org | Owner: wsanchez@apple.com Type: Defect | Status: closed Priority: 3: Important | Milestone: 2.0 Component: PyKerberos | Version: Severity: Other | Resolution: fixed Keywords: | -----------------------------+---------------------------------------------- Changes (by wsanchez@apple.com): * status: new => closed * resolution: => fixed -- Ticket URL: <https://trac.calendarserver.org/ticket/275#comment:4> CalendarServer </> HTTP/WebDAV/CalDAV Server
participants (1)
-
CalendarServer