Changeset f0807b8

Timestamp:

Jan 21, 2012, 5:18:09 PM (12 years ago)

Author:

George Silvis, III <george.iii.silvis@…>

Branches:

no-cups

Children:

57bc2dc

Parents:

15fb0f8 (diff), 374c558 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

George Silvis, III <george.iii.silvis@…> (01/21/12 17:18:09)

git-committer:

George Silvis, III <george.iii.silvis@…> (01/21/12 17:18:09)

Message:

Merge branch 'no-cups' of ​git://github.com/jhamrick/gutenbach into no-cups

Conflicts:

server/lib/TODO

Files:

• queue/lib/build-gutenbach-queue (modified) (1 diff)
• server/lib/TODO (modified) (4 diffs)

queue/lib/build-gutenbach-queue

@@ -7 +7 @@
 while true; do
     time=$(date)
-    echo "This is a work in progress!  Please send bugs to jhamrick." >> /tmp/gutenbach/current_queue_temp
+    echo "This is a work in progress!  Please send bugs to gutenbach@mit.edu." >> /tmp/gutenbach/current_queue_temp
     echo "" >> /tmp/gutenbach/current_queue_temp
     echo "As of $time:" >> /tmp/gutenbach/current_queue_temp

server/lib/TODO

@@ -18 +18 @@
      [ ] print job
      [ ] validate job
-     [ ] pause printer
-     [ ] resume printer
+     [x] pause printer
+     [x] resume printer
      [\] set printer attributes
      [\] send uri
@@ -28 +28 @@
 - add support in job.py for:
      [X] restart job
+     [x] resume job
 
 - finish test cases for printer.py
@@ -57 +58 @@
 
 Tickets that should be fixed by this new version:
-   http://gutenbach.mit.edu/ticket/21
-   http://gutenbach.mit.edu/ticket/2
-   http://gutenbach.mit.edu/ticket/7
-   http://gutenbach.mit.edu/ticket/39
-   http://gutenbach.mit.edu/ticket/47
-   http://gutenbach.mit.edu/ticket/48
-   http://gutenbach.mit.edu/ticket/8
-   http://gutenbach.mit.edu/ticket/34
-   http://gutenbach.mit.edu/ticket/38
-   http://gutenbach.mit.edu/ticket/41
-   http://gutenbach.mit.edu/ticket/18
-
-
+   [ ] http://gutenbach.mit.edu/ticket/21
+   [ ] http://gutenbach.mit.edu/ticket/2
+   [ ] http://gutenbach.mit.edu/ticket/7
+   [ ] http://gutenbach.mit.edu/ticket/39
+   [ ] http://gutenbach.mit.edu/ticket/47
+   [ ] http://gutenbach.mit.edu/ticket/48
+   [ ] http://gutenbach.mit.edu/ticket/8
+   [ ] http://gutenbach.mit.edu/ticket/34
+   [x] http://gutenbach.mit.edu/ticket/38
+   [ ] http://gutenbach.mit.edu/ticket/41
+   [ ] http://gutenbach.mit.edu/ticket/18
 
  === CONSIDERATIONS FOR MPD ===
@@ -115 +114 @@
 restart song:
   client.seek(0,1)   [0% through song 1...]
+