maria-developers team mailing list archive

[timour@xxxxxxxxxxxx]

#At file:///etc/ based on revid:root@lamia-20100203064317-whagbeui3pyl1bck

  157 timour@xxxxxxxxxxxx	2010-02-04
      saving uncommitted changes in /etc prior to apt run

    modified:
      cups/subscriptions.conf
      cups/subscriptions.conf.O
      resolv.conf
=== modified file 'cups/subscriptions.conf'
--- a/cups/subscriptions.conf	2010-02-03 06:43:17 +0000
+++ b/cups/subscriptions.conf	2010-02-04 11:25:37 +0000
@@ -1,11 +1,11 @@
 # Subscription configuration file for CUPS v1.4.1
-# Written by cupsd on 2010-02-02 08:18
-NextSubscriptionId 101
-<Subscription 100>
+# Written by cupsd on 2010-02-04 13:19
+NextSubscriptionId 102
+<Subscription 101>
 Events printer-state-changed printer-restarted printer-shutdown printer-stopped printer-added printer-deleted job-state-changed job-created job-completed job-stopped job-progress
 Owner tsk
 LeaseDuration 86400
 Interval 0
-ExpirationTime 1265177812
-NextEventId 8
+ExpirationTime 1265368739
+NextEventId 1
 </Subscription>

=== modified file 'cups/subscriptions.conf.O'
--- a/cups/subscriptions.conf.O	2010-02-03 06:43:17 +0000
+++ b/cups/subscriptions.conf.O	2010-02-04 11:25:37 +0000
@@ -1,11 +1,3 @@
 # Subscription configuration file for CUPS v1.4.1
-# Written by cupsd on 2010-02-02 08:17
+# Written by cupsd on 2010-02-03 08:43
 NextSubscriptionId 101
-<Subscription 100>
-Events printer-state-changed printer-restarted printer-shutdown printer-stopped printer-added printer-deleted job-state-changed job-created job-completed job-stopped job-progress
-Owner tsk
-LeaseDuration 86400
-Interval 0
-ExpirationTime 1265177812
-NextEventId 7
-</Subscription>

=== modified file 'resolv.conf'
--- a/resolv.conf	2010-02-01 11:56:20 +0000
+++ b/resolv.conf	2010-02-04 11:25:37 +0000
@@ -1,2 +1,3 @@
 # Generated by NetworkManager
-nameserver 192.168.2.1
+nameserver 212.50.0.10
+nameserver 212.50.10.50

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: timour@xxxxxxxxxxxx-20100204112537-3a6fyd3ibqzi73wc
# target_branch: file:///etc/
# testament_sha1: 50dc81f8c011d220ce4aecacaeb061faba5bf2e6
# timestamp: 2010-02-04 13:25:39 +0200
# base_revision_id: root@lamia-20100203064317-whagbeui3pyl1bck
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWTW36XMAArFfgAAQWGP/91Ih
jIC////wUAUe7Zjs0EXdt1qGlMJKTIpvSZTJ6aZqNT1NH6ptExNPUAaAlJJ5T1PU2k00ekBoA0AA
AAkSJpiJk1T0jR6mmIaepkNNDQGhhoaAAADQAAAAAkiTRkNAmmmUyNUPJ6UeoNNA00TpfTbBnY+e
XsRlysg0naTq3GyPMqSUFHWEqVFUY2PTDVeHZoqCYpU5fNWoH5d2Y0z7tML3V5VPEnQnS9m2ljyj
9KV6yfTtCYZpFUMCpgm46q2a89XDErGuoUMW8BBgDqd/awwN/oa4Gwx5FBaiNRGkhOBOf04pFDAz
UL6fVMhytIyRyV0Oy373dw4mJmBtE4W6nJ4T4MAwQbmCIaBnIuAQI9ZKaGxHmOoexojTO6CEXUMy
OJSJzKUaQ8tZHVQkwDtmYoH4mljsfwQVvIRXp5itp8BiM314OJ7j+ANYh5fGydCtAXBRIgUytIEg
urMqySo7YgYo3N8nibt0lRFzjENEHERwCOCBklA8Og6EhDsMUx0x0sFYKETI4wO1oGU54QqpQiEI
iiGTySLaj9DK2NhFSDXRI4IxEUw00YqOtqHMDesRxA6CxtRqXkTI3HLzMKuLwwME8dOZSg2oi+/h
wLAwV5Z90nVp027G0KcrjMiyLS2ETnrYQntkjI+oHI1oTETrwuEXAYodx+LSfPUqEbhWUJnFCwoR
K880VGBWYc7JmeVQGttZaTIEEHNzQlyhHBy0RHONaBh6G8y0zN/Op0qVGa6Eby5f+gabW1zZbOC0
3TC0gwhDlUTjAJCpi8I5I47KfAZENt9CZz9+DOlIxFWrGDH9nKTtB1eE5+kgopRAux8pC6+jpgXN
EsAHNuBjQcRtwf9M+VOo1yMdhY5o9EtKq+Xpcg9kjopsvECOyAzxH6QMAImsuLCRDd15t5Idh5UC
CmgXjWUoFBEiPNBsgYjMTMFmlY9zs8tiOJyKsfCD0AvA0Jn8nQiRNXhz/MRTqeRgiSPORAdb1ZEp
i3cT9enV3Bkhz27xedOF9Ncqb4R4KdTYbWKShYiju1uY8cJk3x7dt+9+zC1puM4Mi3e000WcF57d
drB9tY9MOZUhovknSyzdiCa5QJC+zDfcRlIkssQkZh1/Vey91ixItEQ1EZAme7PzNwPyQ87krDij
ZeIelRYIZTy6JMfcGdB+NQqyIs0fuGh1myGGYWKD1kKrSoZ146gfoB8rPJKrmKxI4CCHFKAYfuLu
g9M/Oz4WarrRJz4gloVnRIikVVh7QIqho5yYXCxJ4yE0RDkPOApgVMh0h124+ZpzW5XQYD74IHFq
kVoHkKSRNdYA10NLEFfmaaN0gn5Yz2xxgNswPcjtEYk7wqJDiqrvrQT9/hrtqgmkXd8NQPsRV8Zi
auyMnHBoHgVm8sgIlcGOHC1ZitdZpFqPEkWCz0YZxTK2jkxeeTaYtbEZBvF11rxyNxuBqDcUYpXi
osvecLWRUDJHqBsBp9iYn5I7X2xsDNI0X9XqsztF0/j1A9BEENKKDqSOEhshDd4ARgihBYH8Id/i
7kinChIGtv0uYA==