[or-cvs] r21616: {projects} commit with conflicts and all. (projects/todo)
Andrew Lewman
andrew at torproject.org
Wed Feb 10 20:26:42 UTC 2010
Author: phobos
Date: 2010-02-10 20:26:42 +0000 (Wed, 10 Feb 2010)
New Revision: 21616
Modified:
projects/todo/tpo-highlevel-tasklist.tjp
Log:
commit with conflicts and all.
Modified: projects/todo/tpo-highlevel-tasklist.tjp
===================================================================
--- projects/todo/tpo-highlevel-tasklist.tjp 2010-02-10 15:15:29 UTC (rev 21615)
+++ projects/todo/tpo-highlevel-tasklist.tjp 2010-02-10 20:26:42 UTC (rev 21616)
@@ -34,19 +34,23 @@
task op_main "Business Operations" {
task op_one "Community Forums" {
start 2009-11-19
+<<<<<<< .mine
+ end 2010-02-28
+=======
end 2010-01-31
+>>>>>>> .r21615
allocate andrew, volunteer, vendor
complete 75
}
task op_two "Website Documentation Update" {
start 2009-11-19
- end 2009-12-15
+ effort 3d
allocate andrew, volunteer
complete 25
}
task op_three "Package Naming Conversion" {
start 2009-11-19
- end 2009-12-31
+ effort 3d
allocate andrew
complete 10
}
@@ -64,13 +68,25 @@
}
task op_six "Audit Prep" {
start 2009-11-19
+<<<<<<< .mine
+ end 2010-02-28
+=======
end 2010-01-31
+>>>>>>> .r21615
allocate andrew, melissa, auditor
+<<<<<<< .mine
+ complete 85
+=======
complete 95
+>>>>>>> .r21615
}
task op_seven "Tor Logo Store" {
start 2009-11-19
+<<<<<<< .mine
+ end 2010-02-15
+=======
end 2010-01-31
+>>>>>>> .r21615
allocate andrew, karen, vendor
complete 50
}
@@ -82,13 +98,21 @@
}
task op_nine "2009 Annual Report" {
start 2009-11-19
- end 2010-01-31
+ end 2010-02-28
allocate andrew, karen
+<<<<<<< .mine
+ complete 30
+=======
complete 35
+>>>>>>> .r21615
}
task op_ten "Migrate wiki" {
start 2009-11-19
+<<<<<<< .mine
+ effort 3d
+=======
effort 5d
+>>>>>>> .r21615
allocate andrew, volunteer
complete 50
}
@@ -100,13 +124,23 @@
}
task op_twelve "Advocacy Videos" {
start 2009-11-19
+<<<<<<< .mine
end 2010-01-31
+ allocate karen
+ complete 100
+=======
+ end 2010-01-31
allocate karen, carolyn
complete 100
+>>>>>>> .r21615
}
task op_thirteen "Brochure" {
start 2009-11-19
+<<<<<<< .mine
+ end 2010-02-28
+=======
end 2010-01-31
+>>>>>>> .r21615
allocate karen
complete 50
}
@@ -114,17 +148,29 @@
start 2010-01-01
end 2010-12-31
allocate karen, andrew
+<<<<<<< .mine
+ complete 100
+=======
complete 10
+>>>>>>> .r21615
}
task op_fifteen "Tor Support Organization" {
start 2009-11-19
+<<<<<<< .mine
+ effort 14d
+=======
effort 60d
+>>>>>>> .r21615
allocate andrew
complete 0
}
task op_sixteen "Friends of Tor International" {
start 2009-11-19
+<<<<<<< .mine
+ effort 14d
+=======
effort 60d
+>>>>>>> .r21615
allocate andrew
complete 0
}
@@ -151,15 +197,19 @@
task tr_main "Translations" {
task tr_one "Website and Pootle Integration" {
start 2009-11-19
- end 2009-12-11
+ end 2010-01-31
allocate runa, carolyn
- complete 85
+ complete 100
}
task tr_two "Burmese Translator" {
start 2009-11-19
end 2009-12-31
allocate carolyn, volunteer
+<<<<<<< .mine
+ complete 85
+=======
complete 75
+>>>>>>> .r21615
}
task tr_three "Arabic Translator" {
start 2009-11-19
@@ -214,9 +264,13 @@
}
task fin_three "Audit Documentation Prep" {
start 2009-11-19
- end 2009-12-31
+ end 2010-02-28
allocate melissa, andrew
+<<<<<<< .mine
+ complete 90
+=======
complete 100
+>>>>>>> .r21615
}
task fin_four "Monthly Report Generation" {
start 2009-11-19
@@ -265,7 +319,7 @@
task rd_three_two "Trust Metrics Research" {
start 2009-11-20
end 2010-06-01
- allocate roger, volunteer
+ allocate roger, karsten, volunteer
complete 25
}
}
@@ -304,7 +358,7 @@
task rd_seven "Everyone as a Relay" {
task rd_seven_one "Blog post on thoughts" {
start 2009-11-19
- end 2009-12-16
+ end 2010-01-31
allocate steven
complete 100
}
@@ -407,13 +461,21 @@
}
task tb_two "Integrate with private browsing" {
start 2009-11-19
+<<<<<<< .mine
+ effort 30d
+=======
end 2010-03-31
+>>>>>>> .r21615
allocate mike
complete 10
}
task tb_three "Google Chrome Integration" {
start 2009-11-19
+<<<<<<< .mine
+ effort 30d
+=======
end 2010-03-31
+>>>>>>> .r21615
allocate mike
complete 30
}
@@ -425,7 +487,7 @@
}
task tb_five "torbutton alpha branch" {
start 2009-11-19
- end 2010-01-31
+ effort 5d
allocate mike, volunteer
complete 50
}
@@ -434,9 +496,9 @@
task latency "Latency Improvements" {
task lat_one "Circuit Build Time" {
start 2009-11-19
- end 2009-12-31
+ effort 14d
allocate mike
- complete 25
+ complete 50
}
task lat_two "Connection rate limiting" {
start 2009-11-19
@@ -461,9 +523,9 @@
}
task gt_two "handle split packages" {
start 2009-11-19
- end 2009-12-15
+ end 2010-01-31
allocate christian
- complete 75
+ complete 100
}
task gt_three "Chinese translation" {
start 2009-11-19
@@ -512,9 +574,9 @@
}
task bdb_five "Microblogging bots" {
start 2009-12-07
- end 2009-12-31
+ effort 14d
allocate runa, volunteer
- complete 25
+ complete 50
}
task bdb_six "Instant Messaging bots" {
start 2010-01-02
@@ -522,18 +584,24 @@
allocate volunteer
complete 0
}
+ task bdb_seven "IRC bots" {
+ start 2010-01-31
+ effort 30d
+ allocate runa, volunteer
+ complete 0
+ }
}
task mobiletor "Tor on mobiles" {
task mt_one "OrBot: Tor on Android" {
start 2009-11-19
- end 2009-12-31
+ end 2010-02-28
allocate jacob, volunteer
complete 75
}
task mt_two "Tor on Maemo" {
start 2009-11-19
- end 2010-01-31
+ effort 30d
allocate jacob, volunteer
complete 15
}
@@ -541,83 +609,135 @@
start 2009-11-19
end 2009-12-31
allocate bruce
+<<<<<<< .mine
+ complete 100
+=======
complete 90
+>>>>>>> .r21615
}
}
task packaging "Packaging Improvements" {
task pkg_one "Vidalia as deb" {
start 2009-11-19
+<<<<<<< .mine
+ end 2010-01-31
+=======
end 2010-01-20
+>>>>>>> .r21615
allocate erinn
complete 100
}
task pkg_two "Vidalia as rpm" {
start 2009-11-19
+<<<<<<< .mine
+ end 2010-01-31
+=======
end 2010-02-15
+>>>>>>> .r21615
allocate erinn
+<<<<<<< .mine
+ complete 100
+=======
complete 50
+>>>>>>> .r21615
}
task pkg_three "torproject deb repo" {
start 2009-11-19
+<<<<<<< .mine
+ end 2010-01-31
+=======
end 2010-01-20
+>>>>>>> .r21615
allocate erinn, peter
complete 100
}
task pkg_four "torproject rpm repo" {
start 2009-11-19
+<<<<<<< .mine
+ end 2010-01-31
+=======
end 2010-02-15
+>>>>>>> .r21615
allocate erinn
- complete 0
+ complete 100
}
task pkg_five "Tor Browser Bundle for OS X" {
start 2009-11-19
+<<<<<<< .mine
+ effort 30d
+=======
end 2010-03-31
+>>>>>>> .r21615
allocate erinn, jacob
complete 50
}
task pkg_six "Tor Browser Bundle for Linux" {
start 2009-11-19
+<<<<<<< .mine
+ effort 30d
+=======
end 2010-03-31
+>>>>>>> .r21615
allocate erinn, jacob
complete 50
}
task pkg_seven "Nightly package builds" {
start 2009-11-19
+<<<<<<< .mine
+ effort 14d
+=======
end 2010-03-31
+>>>>>>> .r21615
allocate erinn
complete 0
}
task pkg_eight "Vidalia Bundle for debian/ubuntu" {
start 2009-11-19
+<<<<<<< .mine
+ effort 14d
+=======
end 2010-03-31
+>>>>>>> .r21615
allocate erinn
complete 0
+ !depends pkg_ten
}
task pkg_nine "Vidalia Bundle for centos/suse" {
start 2009-11-19
+<<<<<<< .mine
+ effort 14d
+=======
end 2010-03-31
+>>>>>>> .r21615
allocate erinn
complete 0
+ !depends pkg_ten
}
+ task pkg_ten "Vidalia Control Socket Improvements" {
+ start 2010-01-01
+ effort 5d
+ allocate matt
+ complete 0
+ }
}
task libevent "Libevent Improvements" {
task lb_one "Rate Limiting Integration" {
start 2009-11-19
- end 2009-12-31
+ effort 7d
allocate nick, volunteer
complete 75
}
task lb_two "Buffer events" {
start 2009-11-19
- end 2009-12-31
+ effort 7d
allocate nick, volunteer
complete 75
}
task lb_three "Buffer events merge to Tor" {
start 2009-11-19
- end 2009-12-31
+ effort 7d
allocate nick
complete 50
}
More information about the tor-commits
mailing list